Merge pull request #717 from GlotPress/699-discarding-warning-duplica…

…te-entry 699: Fix issue with dismissing warnings would create a "duplicate" entry
GlotPress · Jun 6, 2017 · ad132d8 · ad132d8
2 parents 596bdc6 + c5883e1
commit ad132d8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/assets/js/editor.js b/assets/js/editor.js
@@ -172,10 +172,10 @@ $gp.editor = (
 				$gp.editor.current.after( html );
 				old_current = $gp.editor.current;
 				old_current.attr( 'id', old_current.attr( 'id' ) + '-old' );
+				old_current.preview.attr( 'id', old_current.preview.attr( 'id' ) + '-old' );
 				$gp.editor.next();
 				old_current.preview.remove();
 				old_current.remove();
-				$gp.editor.current.preview.fadeIn( 800 );
 			},
 			save: function( button ) {
 				var editor, textareaName, data = [], translations;
@@ -217,8 +217,6 @@ $gp.editor = (
 
 						if ( $gp.editor.current.hasClass( 'no-warnings' ) ) {
 							$gp.editor.next();
-						} else {
-							$gp.editor.current.preview.hide();
 						}
 					},
 					error: function( xhr, msg ) {

diff --git a/assets/js/editor.min.js b/assets/js/editor.min.js
diff --git a/gp-includes/assets-loader.php b/gp-includes/assets-loader.php
@@ -34,7 +34,7 @@ function gp_register_default_scripts() {
 	// Register our standard scripts.
 	wp_register_script( 'tablesorter', $url . '/vendor/jquery.tablesorter' . $suffix, array( 'jquery' ), '2.17.8' );
 	wp_register_script( 'gp-common', $url . '/common' . $suffix, array( 'jquery' ), '20150430' );
-	wp_register_script( 'gp-editor', $url . '/editor' . $suffix, array( 'gp-common', 'jquery-ui-tooltip' ), '20170530' );
+	wp_register_script( 'gp-editor', $url . '/editor' . $suffix, array( 'gp-common', 'jquery-ui-tooltip' ), '20170606' );
 	wp_register_script( 'gp-glossary', $url . '/glossary' . $suffix, array( 'gp-editor' ), '20160329' );
 	wp_register_script( 'gp-translations-page', $url . '/translations-page' . $suffix, array( 'gp-editor' ), '20150430' );
 	wp_register_script( 'gp-mass-create-sets-page', $url . '/mass-create-sets-page' . $suffix, array( 'gp-editor' ), '20150430' );