summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--edit_interface.php14
-rw-r--r--js/webtrees.js11
2 files changed, 14 insertions, 11 deletions
diff --git a/edit_interface.php b/edit_interface.php
index 3de4eddbfd..7b859d257c 100644
--- a/edit_interface.php
+++ b/edit_interface.php
@@ -2,7 +2,7 @@
// PopUp Window to provide editing features.
//
// webtrees: Web based Family History software
-// Copyright (C) 2012 webtrees development team.
+// Copyright (C) 2013 webtrees development team.
//
// Derived from PhpGedView
// Copyright (C) 2002 to 2009 PGV Development Team. All rights reserved.
@@ -66,16 +66,10 @@ $controller->addInlineJavascript('
');
$controller->addInlineJavascript('
- function addnewrepository(field) {
- pastefield = field;
- window.open("edit_interface.php?action=addnewrepository&pid=newrepo", "_blank", find_window_specs);
- return false;
- }
-');
-
-$controller->addInlineJavascript('
function openerpasteid(id) {
- window.opener.paste_id(id);
+ if (window.opener.paste_id) {
+ window.opener.paste_id(id);
+ }
window.close();
}
');
diff --git a/js/webtrees.js b/js/webtrees.js
index aa3322513e..f8a77d5365 100644
--- a/js/webtrees.js
+++ b/js/webtrees.js
@@ -1,7 +1,7 @@
// Common javascript functions
//
// webtrees: Web based Family History software
-// Copyright (C) 2012 webtrees development team.
+// Copyright (C) 2013 webtrees development team.
//
// Derived from PhpGedView
// Copyright (C) 2002 to 2009 PGV Development Team. All rights reserved.
@@ -548,6 +548,15 @@ function addnewsource(field) {
return false;
}
+function addnewrepository(field) {
+ pastefield=field;
+ edit_interface({
+ "action": "addnewrepository",
+ "pid": "newrepo"
+ }, null, field);
+ return false;
+}
+
function addnewnote(field) {
pastefield=field;
edit_interface({