refs #1763 : modified - version tag, common javascript library path

- common javascript library name is changed to common3.js (to prevent confliction between versions.)
Needlworks · Feb 18, 2015 · 369e180 · 369e180
1 parent 96608b1
commit 369e180
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 15 deletions.
diff --git a/framework/id/textcube/config.default.php b/framework/id/textcube/config.default.php
@@ -7,11 +7,11 @@
 define('TEXTCUBE_NAME', 'Textcube');
 define('TEXTCUBE_VERSION_ID', '1.10.3');
 define('TEXTCUBE_REVISION', 'root-main-branch1.10-r35');
-define('TEXTCUBE_CODENAME', 'Beta 1');
+define('TEXTCUBE_CODENAME', 'Release Candidate 1');
 define('TEXTCUBE_VERSION', TEXTCUBE_VERSION_ID.' : '.TEXTCUBE_CODENAME);
 define('TEXTCUBE_COPYRIGHT', 'Copyright &copy; 2004-2015. Needlworks / Tatter Network Foundation. All rights reserved. Licensed under the GPL.');
 define('TEXTCUBE_HOMEPAGE', 'http://www.textcube.org/');
-define('TEXTCUBE_RESOURCE_URL', 'http://resources.textcube.org/1.10.2');
+define('TEXTCUBE_RESOURCE_URL', 'http://resources.textcube.org/1.10.3');
 define('TEXTCUBE_NOTICE_URL','http://feeds.feedburner.com/textcube/');
 define('CRLF', "\r\n");
 define('TAB', "	");

diff --git a/interface/blog/comment/delete/index.php b/interface/blog/comment/delete/index.php
@@ -215,7 +215,7 @@
 			var adminSkin = "<?php echo $adminSkinSetting['skin'];?>";
 		//]]>
 	</script>
-	<script type="text/javascript" src="<?php echo $service['resourcepath'];?>/script/common2.js"></script>
+	<script type="text/javascript" src="<?php echo $service['resourcepath'];?>/script/common3.js"></script>
 </head>
 <body>
 	<form name="deleteComment" method="post" action="<?php echo $blogURL;?>/comment/delete/<?php echo $suri['id'];?>">

diff --git a/interface/blog/trackback/send/index.php b/interface/blog/trackback/send/index.php
@@ -20,7 +20,7 @@
 	<link rel="stylesheet" type="text/css" href="<?php echo $service['path'] . $adminSkinSetting['skin'];?>/popup-trackback.css" />
 	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/jquery/jquery-<?php echo JQUERY_VERSION;?>.js"></script>
 	<script type="text/javascript">jQuery.noConflict();</script>
-	<script type="text/javascript" src="<?php echo $service['resourcepath'];?>/script/common2.js"></script>
+	<script type="text/javascript" src="<?php echo $service['resourcepath'];?>/script/common3.js"></script>
 	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/EAF4.js"></script>
 	<!-- script type="text/javascript" src="<?php echo $service['resourcepath'];?>/script/EAF4.js"></script -->
 	<script type="text/javascript">

diff --git a/interface/common/blog/keylog.php b/interface/common/blog/keylog.php
@@ -8,7 +8,7 @@
 
 $adminSkinSetting['skin'] = "/skin/admin/".getBlogSetting("adminSkin", "canon");
 $skin = new KeylogSkin($skinSetting['keylogSkin']);
-$out = str_replace("[##_SKIN_head_end_##]", '<script type="text/javascript">//<![CDATA' . CRLF . 'var servicePath = "' . $service['path'] . '"; var blogURL = "' . $blogURL . '"; var adminSkin = "' . $adminSkinSetting['skin'] . '";//]]></script><script type="text/javascript" src="' . $service['resourcepath'] . '/script/common2.js"></script><script type="text/javascript" src="' . $service['resourcepath'] . '/script/gallery.js"></script>' . $skin->skin, $skin->outter);
+$out = str_replace("[##_SKIN_head_end_##]", '<script type="text/javascript">//<![CDATA' . CRLF . 'var servicePath = "' . $service['path'] . '"; var blogURL = "' . $blogURL . '"; var adminSkin = "' . $adminSkinSetting['skin'] . '";//]]></script><script type="text/javascript" src="' . $service['resourcepath'] . '/script/common3.js"></script><script type="text/javascript" src="' . $service['resourcepath'] . '/script/gallery.js"></script>' . $skin->skin, $skin->outter);
 $keylogView = $skin->keylog;
 $itemsView = '';
 $contentContainer = array();

diff --git a/interface/common/control/header.php b/interface/common/control/header.php
@@ -325,7 +325,7 @@
 	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/jquery/jquery-<?php echo JQUERY_VERSION;?>.js"></script>
 	<script type="text/javascript">jQuery.noConflict();</script>
 	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/EAF4.js"></script>
-	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/common2.js"></script>
+	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/common3.js"></script>
 	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/owner.js"></script>
 <?php
 if(!in_array($blogMenu['contentMenu'],array('post','edit'))) {

diff --git a/interface/common/owner/header.php b/interface/common/owner/header.php
@@ -338,7 +338,7 @@
 	<script type="text/javascript" src="<?php echo  $context->getProperty('service.path');?>/resources/script/jquery/jquery.bpopup-<?php echo JQUERY_BPOPUP_VERSION;?>.js"></script>
 	<script type="text/javascript">jQuery.noConflict();</script>
 	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/EAF4.js"></script>
-	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/common2.js"></script>
+	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/common3.js"></script>
 	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/owner.js"></script>
 <?php
 if(!in_array($blogMenu['contentMenu'],array('post','edit'))) {

diff --git a/interface/common/owner/headerForPopupEditor.php b/interface/common/owner/headerForPopupEditor.php
@@ -80,7 +80,7 @@
 	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/jquery/jquery-<?php echo JQUERY_VERSION;?>.js"></script>
 	<script type="text/javascript">jQuery.noConflict();</script>
 	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/EAF4.js"></script>
-	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/common2.js"></script>
+	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/common3.js"></script>
 	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/gallery.js"></script>
 	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/owner.js"></script>
 	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/editor3.js"></script> 

diff --git a/interface/login/index.php b/interface/login/index.php
@@ -111,7 +111,7 @@
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.resourcepath');?>/script/jquery/jquery-<?php echo JQUERY_VERSION;?>.js"></script>
 	<script type="text/javascript">jQuery.noConflict();</script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.resourcepath');?>/script/EAF4.js"></script>
-	<script type="text/javascript" src="<?php echo $context->getProperty('service.resourcepath');?>/script/common2.js"></script>
+	<script type="text/javascript" src="<?php echo $context->getProperty('service.resourcepath');?>/script/common3.js"></script>
 	<script type="text/javascript">
 		//<![CDATA[
 			var servicePath = "<?php echo $context->getProperty('service.path');?>";

diff --git a/interface/owner/entry/attach/index.php b/interface/owner/entry/attach/index.php
@@ -28,7 +28,7 @@
 		<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/jquery/jquery-<?php echo JQUERY_VERSION;?>.js"></script>
 		<script type="text/javascript">jQuery.noConflict();</script>
 		<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/EAF4.js"></script>
-		<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/common2.js"></script>
+		<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/common3.js"></script>
 		<script type="text/javascript">
 			//<![CDATA[
 				var servicePath = "<?php echo $service['path'];?>";

diff --git a/interface/owner/reader/update/index.php b/interface/owner/reader/update/index.php
@@ -25,7 +25,7 @@
 	<head>
 		<title>Update all feeds</title>
 		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-		<script type="text/javascript" src="<?php echo $serviceURL;?>/resources/script/common2.js"></script>
+		<script type="text/javascript" src="<?php echo $serviceURL;?>/resources/script/common3.js"></script>
 		<script type="text/javascript">
 			//<![CDATA[
 				var servicePath = "<?php echo $service['path'];?>";

diff --git a/interface/owner/skin/setting/tree/preview/index.php b/interface/owner/skin/setting/tree/preview/index.php
@@ -55,7 +55,7 @@
 	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/jquery/jquery-<?php echo JQUERY_VERSION;?>.js"></script>
 	<script type="text/javascript">jQuery.noConflict();</script>
 	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/EAF4.js"></script>
-	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/common2.js"></script>
+	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/common3.js"></script>
 	<script type="text/javascript" src="<?php echo $service['path'];?>/resources/script/owner.js"></script>
 	<style type="text/css">
 		/*<![CDATA[*/

diff --git a/library/view/replyEditorView.php b/library/view/replyEditorView.php
@@ -42,7 +42,7 @@
 			var doesHaveOwnership = <?php echo doesHaveOwnership() ? 'true' : 'false';?>;
 		//]]>
 	</script>
-	<script type="text/javascript" src="<?php echo (doesHaveOwnership() ? $service['path'].'/resources' : $service['resourcepath']);?>/script/common2.js"></script>
+	<script type="text/javascript" src="<?php echo (doesHaveOwnership() ? $service['path'].'/resources' : $service['resourcepath']);?>/script/common3.js"></script>
 	<script type="text/javascript" src="<?php echo (doesHaveOwnership() ? $context->getProperty('service.path').'/resources' : $context->getProperty('service.resourcepath'));?>/script/jquery/jquery-<?php echo JQUERY_VERSION;?>.js"></script>
 	<script type="text/javascript">jQuery.noConflict();</script>
 	<script type="text/javascript">

diff --git a/library/view/view.php b/library/view/view.php
@@ -73,7 +73,7 @@ function getScriptsOnHead($paging, $entryIds = null) {
 	<script type="text/javascript">jQuery.noConflict();</script>
 
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.resourcepath');?>/script/EAF4.js"></script>
-	<script type="text/javascript" src="<?php echo $context->getProperty('service.resourcepath');?>/script/common2.js"></script>
+	<script type="text/javascript" src="<?php echo $context->getProperty('service.resourcepath');?>/script/common3.js"></script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.resourcepath');?>/script/gallery.js" ></script>
 	<script type="text/javascript" src="<?php echo $context->getProperty('service.resourcepath');?>/script/flash.js" ></script>
 	<script type="text/javascript">

diff --git a/resources/script/common2.js → resources/script/common3.js b/resources/script/common2.js → resources/script/common3.js
@@ -608,7 +608,7 @@ function openFullScreen(content,caption,root) {
     <head>\
     <meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1.0">\
 	<title>'+caption+' - iMazing</title>\
-	<script type="text/javascript" src="'+root+'/resources/script/common2.js"></script>\
+	<script type="text/javascript" src="'+root+'/resources/script/common3.js"></script>\
 	<style>\
 		body {\
 			margin:0px;	\