1 files changed, 44 insertions, 32 deletions

diff --git a/src/directives.js b/src/directives.js
index 6b81d864..9aadbd11 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -26,12 +26,13 @@ angularDirective("ng:bind", function(expression){
   return function(element) {
     var lastValue = noop, lastError = noop;
     this.$onEval(function() {
-      var error,
-          value = this.$tryEval(expression, function(e){
-            error = toJson(e);
-          }),
-          isHtml,
-          isDomElement;
+      var error, value, isHtml, isDomElement,
+          oldElement = this.hasOwnProperty('$element') ? this.$element : undefined;
+      this.$element = element;
+      value = this.$tryEval(expression, function(e){
+        error = toJson(e);
+      });
+      this.$element = oldElement;
       if (lastValue === value && lastError == error) return;
       isHtml = value instanceof HTML,
       isDomElement = isElement(value);
@@ -74,7 +75,9 @@ function compileBindTemplate(template){
       });
     });
     bindTemplateCache[template] = fn = function(element){
-      var parts = [], self = this;
+      var parts = [], self = this,
+         oldElement = this.hasOwnProperty('$element') ? self.$element : undefined;
+      self.$element = element;
       for ( var i = 0; i < bindings.length; i++) {
         var value = bindings[i].call(self, element);
         if (isElement(value))
@@ -83,6 +86,7 @@ function compileBindTemplate(template){
           value = toJson(value, true);
         parts.push(value);
       };
+      self.$element = oldElement;
       return parts.join('');
     };
   }
@@ -157,33 +161,32 @@ angularWidget("@ng:repeat", function(expression, element){
     valueIdent = match[3] || match[1];
     keyIdent = match[2];
 
-    if (isUndefined(this.$eval(rhs))) this.$set(rhs, []);
-
     var children = [], currentScope = this;
     this.$onEval(function(){
       var index = 0, childCount = children.length, childScope, lastElement = reference,
           collection = this.$tryEval(rhs, reference), is_array = isArray(collection);
       for ( var key in collection) {
-        if (is_array && !collection.hasOwnProperty(key)) break;
-        if (index < childCount) {
-          // reuse existing child
-          childScope = children[index];
-          childScope[valueIdent] = collection[key];
-          if (keyIdent) childScope[keyIdent] = key;
-        } else {
-          // grow children
-          childScope = template(element.clone(), createScope(currentScope));
-          childScope[valueIdent] = collection[key];
-          if (keyIdent) childScope[keyIdent] = key;
-          lastElement.after(childScope.$element);
-          childScope.$index = index;
-          childScope.$element.attr('ng:repeat-index', index);
-          childScope.$init();
-          children.push(childScope);
+        if (!is_array || collection.hasOwnProperty(key)) {
+          if (index < childCount) {
+            // reuse existing child
+            childScope = children[index];
+            childScope[valueIdent] = collection[key];
+            if (keyIdent) childScope[keyIdent] = key;
+          } else {
+            // grow children
+            childScope = template(element.clone(), createScope(currentScope));
+            childScope[valueIdent] = collection[key];
+            if (keyIdent) childScope[keyIdent] = key;
+            lastElement.after(childScope.$element);
+            childScope.$index = index;
+            childScope.$element.attr('ng:repeat-index', index);
+            childScope.$init();
+            children.push(childScope);
+          }
+          childScope.$eval();
+          lastElement = childScope.$element;
+          index ++;
         }
-        childScope.$eval();
-        lastElement = childScope.$element;
-        index ++;
       };
       // shrink children
       while(children.length > index) {
@@ -196,10 +199,10 @@ angularWidget("@ng:repeat", function(expression, element){
 angularDirective("ng:click", function(expression, element){
   return function(element){
     var self = this;
-    element.bind('click', function(){
+    element.bind('click', function(event){
       self.$tryEval(expression, element);
       self.$root.$eval();
-      return false;
+      event.preventDefault();
     });
   };
 });
@@ -222,8 +225,8 @@ function ngClass(selector) {
     var existing = element[0].className + ' ';
     return function(element){
       this.$onEval(function(){
-        var value = this.$eval(expression);
         if (selector(this.$index)) {
+          var value = this.$eval(expression);
           if (isArray(value)) value = value.join(' ');
           element[0].className = trim(existing + value);
         }
@@ -254,8 +257,17 @@ angularDirective("ng:hide", function(expression, element){
 
 angularDirective("ng:style", function(expression, element){
   return function(element){
+    var resetStyle = getStyle(element);
     this.$onEval(function(){
-      element.css(this.$eval(expression) || {});
+      var style = this.$eval(expression) || {}, key, mergedStyle = {};
+      for(key in style) {
+        if (resetStyle[key] === undefined) resetStyle[key] = '';
+        mergedStyle[key] = style[key];
+      }
+      for(key in resetStyle) {
+        mergedStyle[key] = mergedStyle[key] || resetStyle[key];
+      }
+      element.css(mergedStyle);
     }, element);
   };
 });