Merge pull request #17 from WildcardSearch/maintenance

2.0.2 Release

Author: Mark Vincent

README.md

@@ -1,4 +1,4 @@
-## YourCode 2.0.1
+## YourCode 2.0.2
 for MyBB 1.8.x
 
 *Forget MyCode. Take control of YourCode-- a much better way of handling BB Code for MyBB forums*
@@ -13,7 +13,7 @@ At uninstall everything goes back to normal. No trash left behind and no effects
 
 * YourCode is nestable.
 * YourCode can use a wider range of regex options including case sensitivity, single line, multi-line and eval() modes.
-* YourCode can Import/Export to XML files to share, backup or restore your work-- one at a time or en mass.
+* YourCode can Import/Export to XML files to share, backup or restore your work-- one at a time or en masse.
 * YourCode uses MyBB's internal parser to handle the actual regex replacements so its footprint is minimal.
 * YourCode can have individual group permission for use and viewing separately.
 * YourCode has alternate replacements for those who do not have permission to view them.

Upload/admin/jscripts/yourcode/yourcode_inline.js

@@ -29,7 +29,7 @@ var YourCode = (function(yc) {
 
 	/**
 	 * initiate the selected count and observe inputs
-	 * 
+	 *
 	 * @return void
 	 */
 	function init() {
@@ -42,7 +42,7 @@ var YourCode = (function(yc) {
 
 	/**
 	 * allow custom language overrides
-	 * 
+	 *
 	 * @param  object the custom language
 	 * @return void
 	 */
@@ -52,7 +52,7 @@ var YourCode = (function(yc) {
 
 	/**
 	 * squeal if admin is submitting inline with nothing checked
-	 * 
+	 *
 	 * @param  object the event
 	 * @return void
 	 */
@@ -65,7 +65,7 @@ var YourCode = (function(yc) {
 
 	/**
 	 * sync all check boxes on this page with the master
-	 * 
+	 *
 	 * @param  object the event
 	 * @return void
 	 */
@@ -80,7 +80,7 @@ var YourCode = (function(yc) {
 
 	/**
 	 * set all check boxes on this page on/off
-	 * 
+	 *
 	 * @param  bool true for checked, false for unchecked
 	 * @return void
 	 */
@@ -101,12 +101,12 @@ var YourCode = (function(yc) {
 
 	/**
 	 * adjust checked count on-the-fly
-	 * 
+	 *
 	 * @param  object the event
 	 * @return void
 	 */
 	function keepCount(e) {
-		if(this.prop("checked")) {
+		if(this.checked) {
 			++checkCount;
 		} else {
 			--checkCount;
@@ -116,7 +116,7 @@ var YourCode = (function(yc) {
 
 	/**
 	 * update the go button text to reflect the currently checked count
-	 * 
+	 *
 	 * @return void
 	 */
 	function updateCheckCount() {
@@ -125,7 +125,7 @@ var YourCode = (function(yc) {
 
 	/**
 	 * clear all check boxes when the clear button is clicked
-	 * 
+	 *
 	 * @param  object the event
 	 * @return void
 	 */
@@ -135,7 +135,7 @@ var YourCode = (function(yc) {
 
 	/**
 	 * count the initially checked boxes
-	 * 
+	 *
 	 * @return void
 	 */
 	function initialCount() {

Upload/inc/languages/english/admin/yourcode.lang.php

@@ -17,6 +17,7 @@
 // general
 $l['yourcode_yes'] = 'Yes';
 $l['yourcode_no'] = 'No';
+$l['yourcode_cancel'] = 'Cancel';
 
 // columns and labels
 $l['yourcode_activate'] = 'Activate';

Upload/inc/plugins/yourcode/acp.php

@@ -1037,6 +1037,11 @@ function yourcode_admin_import()
 
 	if($mybb->request_method == 'post')
 	{
+		if($mybb->input['import'] == $lang->yourcode_cancel)
+		{
+			admin_redirect($html->url(array("action" => 'tools')));
+		}
+
 		if($mybb->input['mode'] == 'finish')
 		{
 			if(is_array($mybb->input['export_ids']) && !empty($mybb->input['export_ids']))
@@ -1100,7 +1105,7 @@ function yourcode_admin_import()
 			$onsubmit = <<<EOF
 var all_checks = $('input.checkbox_input'); for(x = 0; x < all_checks.length; x++) { if(all_checks[x].checked) { return true; } } alert('{$lang->yourcode_import_selection_error}'); return false;
 EOF;
-			$form = new Form($html->url(array("action" => 'import', "mode" => 'finish')), 'post', '', '', '', '', $onsubmit);
+			$form = new Form($html->url(array("action" => 'import', "mode" => 'finish')), 'post');
 			$form_container = new FormContainer($lang->yourcode_import);
 
 			$percentage = 45;
@@ -1158,7 +1163,9 @@ function yourcode_admin_import()
 			$form_container->output_cell('&nbsp;');
 			$form_container->construct_row();
 			$form_container->end();
-			$buttons = array($form->generate_submit_button($lang->yourcode_import, array('name' => 'import')));
+			$buttons = array();
+			$buttons[] = $form->generate_submit_button($lang->yourcode_import, array("onclick" => $onsubmit, "name" => 'import'));
+			$buttons[] = $form->generate_submit_button($lang->yourcode_cancel, array("name" => 'import'));
 			$form->output_submit_wrapper($buttons);
 			$form->end();
 		}

Upload/inc/plugins/yourcode/install.php

@@ -69,7 +69,7 @@ function yourcode_info()
 		"website" => 'https://github.com/WildcardSearch/YourCode',
 		"author" => $author,
 		"authorsite" => 'http://www.rantcentralforums.com',
-		"version" => '2.0.1',
+		"version" => '2.0.2',
 		"compatibility" => '18*',
 		"guid" => '36a18ebc285a181a42561141adfd1d7f',
 	);