diff --git a/src/Angular.js b/src/Angular.js index a6b82c7e9188..7d6f659014c4 100644 --- a/src/Angular.js +++ b/src/Angular.js @@ -838,7 +838,7 @@ function copy(source, destination) { function copyRecurse(source, destination) { var h = destination.$$hashKey; - var result, key; + var key; if (isArray(source)) { for (var i = 0, ii = source.length; i < ii; i++) { destination.push(copyElement(source[i])); diff --git a/src/ng/browser.js b/src/ng/browser.js index 55090832a740..1dfd5aa078f2 100644 --- a/src/ng/browser.js +++ b/src/ng/browser.js @@ -24,7 +24,6 @@ */ function Browser(window, document, $log, $sniffer) { var self = this, - rawDocument = document[0], location = window.location, history = window.history, setTimeout = window.setTimeout, diff --git a/src/ng/directive/input.js b/src/ng/directive/input.js index 27098a168560..e844bcf608ed 100644 --- a/src/ng/directive/input.js +++ b/src/ng/directive/input.js @@ -1108,7 +1108,7 @@ function baseInputType(scope, element, attr, ctrl, $sniffer, $browser) { if (!$sniffer.android) { var composing = false; - element.on('compositionstart', function(data) { + element.on('compositionstart', function() { composing = true; }); diff --git a/src/ng/directive/ngModel.js b/src/ng/directive/ngModel.js index 4683f4e31c4d..de8dd196d545 100644 --- a/src/ng/directive/ngModel.js +++ b/src/ng/directive/ngModel.js @@ -265,9 +265,9 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$ }; ngModelSet = function($scope, newValue) { if (isFunction(parsedNgModel($scope))) { - invokeModelSetter($scope, {$$$p: ctrl.$modelValue}); + invokeModelSetter($scope, {$$$p: newValue}); } else { - parsedNgModelAssign($scope, ctrl.$modelValue); + parsedNgModelAssign($scope, newValue); } }; } else if (!parsedNgModel.assign) { @@ -644,7 +644,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$ setValidity(name, undefined); validatorPromises.push(promise.then(function() { setValidity(name, true); - }, function(error) { + }, function() { allValid = false; setValidity(name, false); })); @@ -1102,7 +1102,7 @@ var ngModelDirective = ['$rootScope', function($rootScope) { }); } - element.on('blur', function(ev) { + element.on('blur', function() { if (modelCtrl.$touched) return; if ($rootScope.$$phase) { diff --git a/src/ng/directive/ngOptions.js b/src/ng/directive/ngOptions.js index 57393dfbeb1d..f980e1a6b116 100644 --- a/src/ng/directive/ngOptions.js +++ b/src/ng/directive/ngOptions.js @@ -342,8 +342,8 @@ var ngOptionsDirective = ['$compile', '$parse', function($compile, $parse) { var key = (optionValues === optionValuesKeys) ? index : optionValuesKeys[index]; var value = optionValues[key]; - var locals = getLocals(optionValues[key], key); - var selectValue = getTrackByValueFn(optionValues[key], locals); + var locals = getLocals(value, key); + var selectValue = getTrackByValueFn(value, locals); watchedArray.push(selectValue); // Only need to watch the displayFn if there is a specific label expression diff --git a/src/ng/directive/select.js b/src/ng/directive/select.js index 505fecfb410c..2da021932a5c 100644 --- a/src/ng/directive/select.js +++ b/src/ng/directive/select.js @@ -20,7 +20,7 @@ function chromeHack(optionElement) { * added `