Merge pull request #206 from ddrury/RedundantJS

Removed unused javascript functions

7 files changed, 39 insertions, 41 deletions

diff --git a/edit_changes.php b/edit_changes.php
index c4b6af73e1..2bce261a6c 100644
--- a/edit_changes.php
+++ b/edit_changes.php
@@ -29,25 +29,19 @@ $controller=new WT_Controller_Simple();
 $controller
 	->restrictAccess(\WT\Auth::isModerator())
 	->setPageTitle(WT_I18N::translate('Pending changes'))
-	->pageHeader();
+	->pageHeader()
+	->addInlineJavascript("
+		function show_diff(diffurl) {
+			window.opener.location = diffurl;
+			return false;
+		}
+	");
 
 $action   =WT_Filter::get('action');
 $change_id=WT_Filter::getInteger('change_id');
 $index    =WT_Filter::get('index');
 $ged      =WT_Filter::getInteger('ged');
 
-echo '<script>';
-?>
-	function show_gedcom_record(xref) {
-		var recwin = window.open("gedrecord.php?fromfile=1&pid="+xref, "_blank", edit_window_specs);
-	}
-
-	function show_diff(diffurl) {
-		window.opener.location = diffurl;
-		return false;
-	}
-<?php
-echo '</script>';
 echo '<div id="pending"><h2>', WT_I18N::translate('Pending changes'), '</h2>';
 
 switch ($action) {
diff --git a/family.php b/family.php
index 1dc005fa33..65473bca5d 100644
--- a/family.php
+++ b/family.php
@@ -81,12 +81,6 @@ if ($controller->record && $controller->record->canShow()) {
 $PEDIGREE_FULL_DETAILS = '1'; // Override GEDCOM configuration
 $show_full = '1';
 
-echo '<script>';
-echo 'function show_gedcom_record() {';
-echo ' var recwin=window.open("gedrecord.php?pid=', $controller->record->getXref(), '", "_blank", edit_window_specs);';
-echo '}';
-echo '</script>';
-
 ?>
 <div id="family-page">
 <table align="center" width="95%">
diff --git a/individual.php b/individual.php
index a13dd0d8bb..d31e7be3f3 100644
--- a/individual.php
+++ b/individual.php
@@ -91,8 +91,6 @@ if ($controller->record && $controller->record->canShow()) {
 	exit;
 }
 
-$linkToID=$controller->record->getXref(); // -- Tell addmedia.php what to link to
-
 $controller->addInlineJavascript('
 	jQuery("#tabs").tabs({
 		active:   jQuery.cookie("indi-tab"),
@@ -142,10 +140,6 @@ $controller->addInlineJavascript('
 		showSidebar();
 	}
 
-	function show_gedcom_record() {
-		var recwin=window.open("gedrecord.php?pid='. $controller->record->getXref(). '", "_blank", edit_window_specs);
-	}
-
 	jQuery("#header_accordion1").accordion({
 		active: 0,
 		heightStyle: "content",
diff --git a/mediaviewer.php b/mediaviewer.php
index 646358b0c6..dbd9f87106 100644
--- a/mediaviewer.php
+++ b/mediaviewer.php
@@ -76,9 +76,14 @@ if ($controller->record && $controller->record->canShow()) {
 }
 
 $controller
-	->addInlineJavascript('function show_gedcom_record() {var recwin=window.open("gedrecord.php?pid=' . $controller->record->getXref() . '", "_blank", edit_window_specs);}')
-	->addInlineJavascript('jQuery("#media-tabs").tabs();')
-	->addInlineJavascript('jQuery("#media-tabs").css("visibility", "visible");');
+	->addInlineJavascript('
+		jQuery("#media-tabs")
+			.tabs({
+				create: function(e, ui){
+					jQuery(e.target).css("visibility", "visible");  // prevent FOUC
+				}
+			});
+	');
 
 $linked_indi = $controller->record->linkedIndividuals('OBJE');
 $linked_fam  = $controller->record->linkedFamilies('OBJE');
diff --git a/note.php b/note.php
index f6d65e9b7e..c069f5a6a2 100644
--- a/note.php
+++ b/note.php
@@ -75,9 +75,14 @@ if ($controller->record && $controller->record->canShow()) {
 }
 
 $controller
-	->addInlineJavascript('function show_gedcom_record() {var recwin=window.open("gedrecord.php?pid=' . $controller->record->getXref() . '", "_blank", edit_window_specs);}')
-	->addInlineJavascript('jQuery("#note-tabs").tabs();')
-	->addInlineJavascript('jQuery("#note-tabs").css("visibility", "visible");');
+	->addInlineJavascript('
+		jQuery("#note-tabs")
+			.tabs({
+				create: function(e, ui){
+					jQuery(e.target).css("visibility", "visible");  // prevent FOUC
+				}
+			});
+	');
 
 $linked_indi = $controller->record->linkedIndividuals('NOTE');
 $linked_fam  = $controller->record->linkedFamilies('NOTE');
diff --git a/repo.php b/repo.php
index f02afaf35e..358b12f34b 100644
--- a/repo.php
+++ b/repo.php
@@ -74,12 +74,15 @@ if ($controller->record && $controller->record->canShow()) {
 	exit;
 }
 
-$linkToID=$controller->record->getXref(); // Tell addmedia.php what to link to
-
 $controller
-	->addInlineJavascript('function show_gedcom_record() {window.open("gedrecord.php?pid=' . $controller->record->getXref() . '", "_blank", edit_window_specs);}')
-	->addInlineJavascript('jQuery("#repo-tabs").tabs();')
-	->addInlineJavascript('jQuery("#repo-tabs").css("visibility", "visible");');
+	->addInlineJavascript('
+		jQuery("#repo-tabs")
+			.tabs({
+				create: function(e, ui){
+					jQuery(e.target).css("visibility", "visible");  // prevent FOUC
+				}
+			});
+	');
 
 $linked_sour = $controller->record->linkedSources('REPO');
 
diff --git a/source.php b/source.php
index d7a6445206..dfade18279 100644
--- a/source.php
+++ b/source.php
@@ -74,12 +74,15 @@ if ($controller->record && $controller->record->canShow()) {
 	exit;
 }
 
-$linkToID=$controller->record->getXref(); // Tell addmedia.php what to link to
-
 $controller
-	->addInlineJavascript('function show_gedcom_record() {window.open("gedrecord.php?pid=' . $controller->record->getXref() . '", "_blank", edit_window_specs);}')
-	->addInlineJavascript('jQuery("#source-tabs").tabs();')
-	->addInlineJavascript('jQuery("#source-tabs").css("visibility", "visible");');
+	->addInlineJavascript('
+		jQuery("#source-tabs")
+			.tabs({
+				create: function(e, ui){
+					jQuery(e.target).css("visibility", "visible");  // prevent FOUC
+				}
+			});
+	');
 
 $linked_indi = $controller->record->linkedIndividuals('SOUR');
 $linked_fam  = $controller->record->linkedFamilies('SOUR');