From 6336759db8a2a57c5e68c700df3b2630b7f28bc1 Mon Sep 17 00:00:00 2001
From: Jason Bedard <jason+github@jbedard.ca>
Date: Wed, 6 Jan 2016 21:42:56 -0800
Subject: [PATCH 1/3] style(*): remove unused variables

---
 src/Angular.js              | 2 +-
 src/ng/browser.js           | 1 -
 src/ng/directive/input.js   | 2 +-
 src/ng/directive/ngModel.js | 4 ++--
 src/ng/directive/select.js  | 2 +-
 src/ng/http.js              | 2 +-
 src/ng/parse.js             | 2 +-
 src/ng/rootScope.js         | 2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)

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..a900c310a698 100644
--- a/src/ng/directive/ngModel.js
+++ b/src/ng/directive/ngModel.js
@@ -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/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 `<option>` elements, perhaps by an `ngRepeat` directive.
  */
 var SelectController =
-        ['$element', '$scope', '$attrs', function($element, $scope, $attrs) {
+        ['$element', '$scope', function($element, $scope) {
 
   var self = this,
       optionsMap = new HashMap();
diff --git a/src/ng/http.js b/src/ng/http.js
index 8fb3ae306467..60bf3a014db3 100644
--- a/src/ng/http.js
+++ b/src/ng/http.js
@@ -47,7 +47,7 @@ function $HttpParamSerializerProvider() {
       forEachSorted(params, function(value, key) {
         if (value === null || isUndefined(value)) return;
         if (isArray(value)) {
-          forEach(value, function(v, k) {
+          forEach(value, function(v) {
             parts.push(encodeUriQuery(key)  + '=' + encodeUriQuery(serializeValue(v)));
           });
         } else {
diff --git a/src/ng/parse.js b/src/ng/parse.js
index cddde467bc59..c9c500576026 100644
--- a/src/ng/parse.js
+++ b/src/ng/parse.js
@@ -1455,7 +1455,7 @@ ASTInterpreter.prototype = {
         return context ? {value: locals} : locals;
       };
     case AST.NGValueParameter:
-      return function(scope, locals, assign, inputs) {
+      return function(scope, locals, assign) {
         return context ? {value: assign} : assign;
       };
     }
diff --git a/src/ng/rootScope.js b/src/ng/rootScope.js
index 3658d376e0a1..b05a95cc8589 100644
--- a/src/ng/rootScope.js
+++ b/src/ng/rootScope.js
@@ -750,7 +750,7 @@ function $RootScopeProvider() {
             dirty, ttl = TTL,
             next, current, target = this,
             watchLog = [],
-            logIdx, logMsg, asyncTask;
+            logIdx, asyncTask;
 
         beginPhase('$digest');
         // Check for changes to browser url that happened in sync before the call to $digest

From 831ed3734de6cad8c929178eaa01773d72b461d6 Mon Sep 17 00:00:00 2001
From: Jason Bedard <jason+github@jbedard.ca>
Date: Wed, 6 Jan 2016 21:44:13 -0800
Subject: [PATCH 2/3] style(ngModel,ngOptions): make use of declared but unused
 variables

---
 src/ng/directive/ngModel.js   | 4 ++--
 src/ng/directive/ngOptions.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ng/directive/ngModel.js b/src/ng/directive/ngModel.js
index a900c310a698..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) {
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

From 3eb168236f28ce49466def3f0342ffcc8cc056ec Mon Sep 17 00:00:00 2001
From: Jason Bedard <jason+github@jbedard.ca>
Date: Wed, 6 Jan 2016 21:45:04 -0800
Subject: [PATCH 3/3] style($templateRequest): rename minError var to avoid
 name conflict

---
 src/ng/templateRequest.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ng/templateRequest.js b/src/ng/templateRequest.js
index 59cba2e77d4b..3b34c146c147 100644
--- a/src/ng/templateRequest.js
+++ b/src/ng/templateRequest.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var $compileMinErr = minErr('$compile');
+var $templateRequestMinErr = minErr('$compile');
 
 /**
  * @ngdoc provider
@@ -96,7 +96,7 @@ function $TemplateRequestProvider() {
 
       function handleError(resp) {
         if (!ignoreRequestError) {
-          throw $compileMinErr('tpload', 'Failed to load template: {0} (HTTP status: {1} {2})',
+          throw $templateRequestMinErr('tpload', 'Failed to load template: {0} (HTTP status: {1} {2})',
             tpl, resp.status, resp.statusText);
         }
         return $q.reject(resp);