Removed addClass, removeClass.

Author: RichardLitt

src/ng/directive/ngId.js

@@ -8,12 +8,10 @@ function idDirective(name, selector) {
       link: function(scope, element, attr) {
         var oldVal;
 
-        // ?
-        scope.$watch(attr[name], ngClassWatchAction, true);
+        scope.$watch(attr[name], ngIdWatchAction, true);
 
-        // ? What is ngClassWatchAction
         attr.$observe('id', function(value) {
-          ngClassWatchAction(scope.$eval(attr[name]));
+          ngIdWatchAction(scope.$eval(attr[name]));
         });
 
 
@@ -22,28 +20,25 @@ function idDirective(name, selector) {
             // jshint bitwise: false
             var mod = $index & 1;
             if (mod !== old$index & 1) {
-              var classes = arrayClasses(scope.$eval(attr[name]));
-              mod === selector ?
-                addClasses(classes) :
-                removeClasses(classes);
+              var id = typeofId(scope.$eval(attr[name]));
+              if (mod === selector) {
+                replaceId(id);
+              }
             }
           });
         }
 
-        //function addIdClasses(classes) {
-        function addId(id) {
-          // ? what is digestClassCounts?
-          var newClasses = digestClassCounts(classes, 1);
-          attr.$addClass(newClasses);
+        // Used in place of addClass and removeClass, as it must be unique.
+        function replaceId(id) {
+          attr.$attr('id', id)
         }
 
-        function removeClasses(classes) {
-          var newClasses = digestClassCounts(classes, -1);
-          attr.$removeClass(newClasses);
+        // New
+        function uniqueId(id) {
+          /* Check if the id is unique throughout the view */
         }
 
         // This is the joining function. This shouldn't exist
-        // There can only be one. highlander. 
         function digestIdCounts (ids, count) {
           var idCounts = element.data('$idCounts') || {};
           var idsToUpdate = [];
@@ -76,12 +71,12 @@ function idDirective(name, selector) {
 
         function ngIdWatchAction(newVal) {
           if (selector === true || scope.$index % 2 === selector) {
-            var newClasses = arrayClasses(newVal || []);
+            var newId = typeofId(newVal || []);
             if (!oldVal) {
-              addClasses(newClasses);
+              addId(newId);
             } else if (!equals(newVal,oldVal)) {
-              var oldClasses = arrayClasses(oldVal);
-              updateClasses(oldClasses, newClasses);
+              var oldId = typeofId(oldVal);
+              updateId(oldId, newId);
             }
           }
           oldVal = copy(newVal);
@@ -103,21 +98,26 @@ function idDirective(name, selector) {
       return values;
     }
 
-    function arrayClasses (classVal) {
-      if (isArray(classVal)) {
-        return classVal;
-      } else if (isString(classVal)) {
-        return classVal.split(' ');
-      } else if (isObject(classVal)) {
-        var classes = [], i = 0;
-        forEach(classVal, function(v, k) {
+    function typeofId (idVal) {
+      //if (isArray(classVal)) {
+      //  return classVal;
+      //} else if (isString(classVal)) {
+      if (isString(idVal)) {
+        return idVal;
+      } else if (isObject(idVal)) {
+        var ids = [], i = 0;
+        forEach(idVal, function(v, k) {
+          // This should push for all classes. That isn't ideal. 
+          // We want it to only push for one.
           if (v) {
-            classes.push(k);
+            ids.push(k);
+            // This should make it break after the first truthy value.
+            return ids;
           }
         });
-        return classes;
+        return ids;
       }
-      return classVal;
+      return idVal;
     }
   }];
 }