Merge branch 'code-size-optim'

ckeditor · Aug 10, 2015 · d927e87 · d927e87
2 parents 5f31191 + 54b190f
commit d927e87
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/tests/_benderjs/ckeditor/static/tools.js b/tests/_benderjs/ckeditor/static/tools.js
@@ -997,8 +997,7 @@
 		 * @returns {String}
 		 */
 		escapeRegExp: function( str ) {
-			// http://stackoverflow.com/questions/3446170/escape-string-for-use-in-javascript-regex
-			return str.replace( /[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&' );
+			return str.replace( /[\-[\]\/{}()*+?.\\^$|]/g, '\\$&' );
 		},
 
 		/**

diff --git a/tests/plugins/clipboard/isdroprangeaffectedbydragrange.js b/tests/plugins/clipboard/isdroprangeaffectedbydragrange.js
@@ -37,12 +37,9 @@
 
 	var tcs = {};
 
-	/*
-	 * This is a generic function.
-	 * http://stackoverflow.com/questions/4313841/javascript-how-can-i-insert-a-string-at-a-specific-index
-	 */
-	function splice( elem, idx, rem, s ) {
-		return elem.slice( 0, idx ) + s + elem.slice( idx + Math.abs( rem ) );
+	// Inserts "insertion" at index "idx" in "str".
+	function splice( str, idx, insertion ) {
+		return str.slice( 0, idx ) + insertion + str.slice( idx );
 	}
 
 	/*
@@ -181,8 +178,8 @@
 
 		var testName = element.getOuterHtml ? element.getOuterHtml() : element.getText() + ': ';
 
-		var dragStart = splice( dragRange.startContainer.getText(), dragRange.startOffset, 0, '[' );
-		var dragEnd = splice( dragRange.endContainer.getText(), dragRange.endOffset, 0, ']' );
+		var dragStart = splice( dragRange.startContainer.getText(), dragRange.startOffset, '[' );
+		var dragEnd = splice( dragRange.endContainer.getText(), dragRange.endOffset, ']' );
 
 		testName = testName + ' ' + dragStart + ' ';
 		testName = testName + ' ' + dragEnd + ' ';
@@ -198,7 +195,7 @@
 			var next = dropRange.startContainer.getChild( dropRange.startOffset );
 			drop = drop + ( next ? next.getText() : '' );
 		} else {
-			drop = 'text' + splice( dropRange.startContainer.getText(), dropRange.startOffset, 0, '^' );
+			drop = 'text' + splice( dropRange.startContainer.getText(), dropRange.startOffset, '^' );
 		}
 
 		return suiteName + ' - ' + testName + ' ' + drop + ' ';

diff --git a/tests/utils/misc.js b/tests/utils/misc.js
@@ -54,6 +54,21 @@
 
 			assert.areSame( '<p>bc</p>', bender.tools.compatHtml( sourceHtml, false, false, false, false, false, true ) );
 			assert.areSame( sourceHtml, bender.tools.compatHtml( sourceHtml ) );
+		},
+
+		'test escapeRegExp': function() {
+			var characters = '-[]/{}()*+?.\\^$|',
+				expected = '\\' + characters.split( '' ).join( '\\' ),
+				escaped = bender.tools.escapeRegExp( characters );
+
+			assert.areSame( expected, escaped, 'all characters were escaped' );
+		},
+
+		'test escapeRegExp - escape only special characters': function() {
+			var characters = 'a%#@b c',
+				escaped = bender.tools.escapeRegExp( characters );
+
+			assert.areSame( characters, escaped, 'all characters were left untouched' );
 		}
 	} );
 } )();