Update jQuery, jQuery UI and jQuery UI Touch Punch

jQuery to 1.11.1 jQuery UI to 1.11.1 jQuery UI Touch Punch to 0.2.3
Derky · Aug 23, 2014 · 706ef0b · 706ef0b
1 parent c1b1a84
commit 706ef0b
Show file tree

Hide file tree

Showing 14 changed files with 50 additions and 34 deletions.
diff --git a/contrib/subsilver2.xml b/contrib/subsilver2.xml
@@ -51,6 +51,7 @@
 				<rev-version>1.0.5</rev-version>
 				<changelog lang="en">
 					<change>Add custom CSS class 'sortables_captcha_box' for easier customisation</change>
+					<change>Update jQuery to 1.11.1, jQuery UI to 1.11.1 and jQuery UI Touch Punch to 0.2.3</change>
 				</changelog>
 			</entry>
 
@@ -65,9 +66,7 @@
 	<action-group>
 		<copy>
 			<file from="root/styles/subsilver2/template/captcha_sortables.html" to="styles/subsilver2/template/captcha_sortables.html" />
-			<file from="root/styles/subsilver2/template/js/jquery-1.8.3.min.js" to="styles/subsilver2/template/js/jquery-1.8.3.min.js" />
-			<file from="root/styles/subsilver2/template/js/jquery-ui-1.9.2.custom.min.js" to="styles/subsilver2/template/js/jquery-ui-1.9.2.custom.min.js" />
-			<file from="root/styles/subsilver2/template/js/jquery-ui-touch-punch.min.js" to="styles/subsilver2/template/js/jquery-ui-touch-punch.min.js" />
+			<file from="root/styles/subsilver2/template/js/*.*" to="styles/subsilver2/template/js/*.*" />
 		</copy>
 
 		<diy-instructions lang="en">Go to the Administration Control Panel > Styles > Templates > And refresh subsilver2</diy-instructions>

diff --git a/contrib/update_1.0.4_to_1.0.5.xml b/contrib/update_1.0.4_to_1.0.5.xml
@@ -83,8 +83,8 @@ DROP INDEX phpbb_sortables_answers_aid;]]></sql>
 			<file from="root/styles/prosilver/template/js/*.*" to="styles/prosilver/template/js/*.*" />
 		</copy>
 		<delete>
-			<file name="styles/prosilver/template/js/jquery-1.4.4.min.js @TODOOOOOOOOOOOOOOOOOOOO" />
-			<file name="styles/prosilver/template/js/jquery-ui-1.8.9.custom.min.js @TODOOOOOOOOOOOOOOOOOOOO" />
+			<file name="styles/prosilver/template/js/jquery-1.8.3.min.js" />
+			<file name="styles/prosilver/template/js/jquery-ui-1.9.2.custom.min.js" />
 		</delete>
 
 		<diy-instructions lang="en">Go to the Administration Control Panel and click 'Purge Cache'. After purging the cache go to the tab 'Styles', click on 'Templates' and refresh the prosilver template.</diy-instructions>

diff --git a/install_sortables_captcha_plugin.xml b/install_sortables_captcha_plugin.xml
@@ -108,6 +108,7 @@
 					<change>Removed duplicate answer_id INDEX for the phpbb_sortables_answers table</change>
 					<change>Fixed RANDOM() statement for SQLite, Oracle and Firebird databases</change>
 					<change>Add custom CSS class 'sortables_captcha_box' for easier customisation</change>
+					<change>Update jQuery to 1.11.1, jQuery UI to 1.11.1 and jQuery UI Touch Punch to 0.2.3</change>
 				</changelog>
 			</entry>
 		</history>
@@ -152,9 +153,7 @@
 			<file from="root/includes/captcha/plugins/phpbb_captcha_sortables_plugin.php" to="includes/captcha/plugins/phpbb_captcha_sortables_plugin.php" />
 			<file from="root/language/en/mods/captcha_sortables.php" to="language/en/mods/captcha_sortables.php" />
 			<file from="root/styles/prosilver/template/captcha_sortables.html" to="styles/prosilver/template/captcha_sortables.html" />
-			<file from="root/styles/prosilver/template/js/jquery-1.8.3.min.js" to="styles/prosilver/template/js/jquery-1.8.3.min.js" />
-			<file from="root/styles/prosilver/template/js/jquery-ui-1.9.2.custom.min.js" to="styles/prosilver/template/js/jquery-ui-1.9.2.custom.min.js" />
-			<file from="root/styles/prosilver/template/js/jquery-ui-touch-punch.min.js" to="styles/prosilver/template/js/jquery-ui-touch-punch.min.js" />
+			<file from="root/styles/prosilver/template/js/*.*" to="styles/prosilver/template/js/*.*" />
 		</copy>
 
 		<diy-instructions lang="en">Go to the Administration Control Panel > General > Board Configuration > Spambot countermeasures. Configure the Sortables plugin and then return to set it as default.</diy-instructions>

diff --git a/root/includes/captcha/plugins/phpbb_captcha_sortables_plugin.php b/root/includes/captcha/plugins/phpbb_captcha_sortables_plugin.php
@@ -230,8 +230,8 @@ function get_template()
 				'S_TYPE'						=> $this->type,
 
 				// Set version numbers here, so jQuery updates don't require a template refresh anymore
-				'SORTABLES_JQUERY_VERSION'		=> '1.8.3',
-				'SORTABLES_JQUERYUI_VERSION'	=> '1.9.2',
+				'SORTABLES_JQUERY_VERSION'		=> '1.11.1',
+				'SORTABLES_JQUERYUI_VERSION'	=> '1.11.1',
 			));
 
 			return 'captcha_sortables.html';

diff --git a/root/styles/prosilver/template/js/jquery-1.11.1.min.js b/root/styles/prosilver/template/js/jquery-1.11.1.min.js
diff --git a/root/styles/prosilver/template/js/jquery-1.8.3.min.js b/root/styles/prosilver/template/js/jquery-1.8.3.min.js
diff --git a/root/styles/prosilver/template/js/jquery-ui-1.11.1.custom.min.js b/root/styles/prosilver/template/js/jquery-ui-1.11.1.custom.min.js
diff --git a/root/styles/prosilver/template/js/jquery-ui-1.9.2.custom.min.js b/root/styles/prosilver/template/js/jquery-ui-1.9.2.custom.min.js
diff --git a/root/styles/prosilver/template/js/jquery-ui-touch-punch.min.js b/root/styles/prosilver/template/js/jquery-ui-touch-punch.min.js
diff --git a/root/styles/subsilver2/template/js/jquery-1.11.1.min.js b/root/styles/subsilver2/template/js/jquery-1.11.1.min.js
diff --git a/root/styles/subsilver2/template/js/jquery-1.8.3.min.js b/root/styles/subsilver2/template/js/jquery-1.8.3.min.js
diff --git a/root/styles/subsilver2/template/js/jquery-ui-1.11.1.custom.min.js b/root/styles/subsilver2/template/js/jquery-ui-1.11.1.custom.min.js
diff --git a/root/styles/subsilver2/template/js/jquery-ui-1.9.2.custom.min.js b/root/styles/subsilver2/template/js/jquery-ui-1.9.2.custom.min.js
diff --git a/root/styles/subsilver2/template/js/jquery-ui-touch-punch.min.js b/root/styles/subsilver2/template/js/jquery-ui-touch-punch.min.js