Ver código fonte

Made utils.extend() to process things from start to end instead of the opposite. This was impacting on overriding with multiple arguments.

fredck 11 anos atrás
pai
commit
f634ae2278
1 arquivos alterados com 7 adições e 10 exclusões
  1. 7 10
      packages/ckeditor5-ui/src/utils.js

+ 7 - 10
packages/ckeditor5-ui/src/utils.js

@@ -27,21 +27,18 @@ CKEDITOR.define( function() {
 				return target;
 			}
 
-			var args, keys, i;
-
 			if ( arguments.length > 2 ) {
-				args = Array.prototype.splice.call( arguments, 1 );
-				i = args.length;
+				var args = Array.prototype.splice.call( arguments, 1 );
 
-				while ( i-- ) {
-					this.extend( target, args[ i ] );
+				while ( args.length ) {
+					this.extend( target, args.shift() );
 				}
 			} else {
-				keys = Object.keys( source );
-				i = keys.length;
+				var keys = Object.keys( source );
 
-				while ( i-- ) {
-					target[ keys[ i ] ] = source[ keys[ i ] ];
+				while ( keys.length ) {
+					var key = keys.shift();
+					target[ key ] = source[ key ];
 				}
 			}