diff options
| -rw-r--r-- | src/Angular.js | 4 | ||||
| -rw-r--r-- | src/Injector.js | 4 | ||||
| -rw-r--r-- | src/jqLite.js | 8 | ||||
| -rw-r--r-- | src/parser.js | 1 | ||||
| -rw-r--r-- | test/InjectorSpec.js | 8 | ||||
| -rw-r--r-- | test/sanitizerSpec.js | 2 | ||||
| -rw-r--r-- | test/widgetsSpec.js | 2 |
7 files changed, 15 insertions, 14 deletions
diff --git a/src/Angular.js b/src/Angular.js index b2949646..c815d5fc 100644 --- a/src/Angular.js +++ b/src/Angular.js @@ -1027,8 +1027,8 @@ function assertArg(arg, name, reason) { if (window.console) window.console.log(error.stack); throw error; } -}; +} function assertArgFn(arg, name) { assertArg(isFunction(arg, name, 'not a function')); -}; +} diff --git a/src/Injector.js b/src/Injector.js index b3d8f113..be00ff3e 100644 --- a/src/Injector.js +++ b/src/Injector.js @@ -74,7 +74,7 @@ function createInjector(providerScope, providers, cache) { } function injectService(services, fn) { - return extend(fn, {$inject:services});; + return extend(fn, {$inject:services}); } function injectUpdateView(fn) { @@ -113,4 +113,4 @@ function injectionArgs(fn) { }); } return fn.$inject; -}; +} diff --git a/src/jqLite.js b/src/jqLite.js index 9c96df4a..8554263a 100644 --- a/src/jqLite.js +++ b/src/jqLite.js @@ -251,11 +251,13 @@ forEach({ * Properties: writes return selection, reads return first value */ JQLite.prototype[name] = function(arg1, arg2) { + var i, key; + if ((fn.length == 2 ? arg1 : arg2) === undefined) { if (isObject(arg1)) { // we are a write, but the object properties are the key/values - for(var i=0; i < this.length; i++) { - for ( var key in arg1) { + for(i=0; i < this.length; i++) { + for (key in arg1) { fn(this[i], key, arg1[key]); } } @@ -268,7 +270,7 @@ forEach({ } } else { // we are a write, so apply to all children - for(var i=0; i < this.length; i++) { + for(i=0; i < this.length; i++) { fn(this[i], arg1, arg2); } // return self for chaining diff --git a/src/parser.js b/src/parser.js index 0a19dad9..6916a3f7 100644 --- a/src/parser.js +++ b/src/parser.js @@ -362,7 +362,6 @@ function parser(text, json){ var token = expect(); var formatter = angularFormatter[token.text]; var argFns = []; - var token; if (!formatter) throwError('is not a valid formatter.', token); while(true) { if ((token = expect(':'))) { diff --git a/test/InjectorSpec.js b/test/InjectorSpec.js index a0f15132..84e515b7 100644 --- a/test/InjectorSpec.js +++ b/test/InjectorSpec.js @@ -87,7 +87,7 @@ describe('injector', function(){ describe('annotation', function(){ it('should return $inject', function(){ - function fn(){}; + function fn(){} fn.$inject = ['a']; expect(injectionArgs(fn)).toBe(fn.$inject); expect(injectionArgs(function(){})).toEqual([]); @@ -105,19 +105,19 @@ describe('injector', function(){ multi-line comment function (a, b){} */ - /* {some type} */ c){ extraParans();}; + /* {some type} */ c){ extraParans();} expect(injectionArgs($f_n0)).toEqual(['$a', 'b']); expect($f_n0.$inject).toEqual(['$a', 'b']); }); it('should handle no arg functions', function(){ - function $f_n0(){}; + function $f_n0(){} expect(injectionArgs($f_n0)).toEqual([]); expect($f_n0.$inject).toEqual([]); }); it('should handle args with both $ and _', function(){ - function $f_n0($a_){}; + function $f_n0($a_){} expect(injectionArgs($f_n0)).toEqual(['$a']); expect($f_n0.$inject).toEqual(['$a']); }); diff --git a/test/sanitizerSpec.js b/test/sanitizerSpec.js index 787ce84c..b42a6237 100644 --- a/test/sanitizerSpec.js +++ b/test/sanitizerSpec.js @@ -186,7 +186,7 @@ describe('HTML', function(){ function tag(name) { writer.start(name, {}); writer.end(name); - }; + } tag('frameset'); tag('frame'); tag('form'); diff --git a/test/widgetsSpec.js b/test/widgetsSpec.js index eab5cce7..58cc33d8 100644 --- a/test/widgetsSpec.js +++ b/test/widgetsSpec.js @@ -798,7 +798,7 @@ describe("widget", function(){ describe('ng:view', function() { - var rootScope, rootScope, $route, $location, $browser; + var rootScope, $route, $location, $browser; beforeEach(function() { rootScope = angular.compile('<ng:view></ng:view>')(); |