fix: throw exception if fa-elements are added to fa-surface

Famous · Aug 11, 2014 · 60c8fe0 · 60c8fe0
1 parent 864bd8b
commit 60c8fe0
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/dist/famous-angular.js b/dist/famous-angular.js
@@ -4087,12 +4087,15 @@ angular.module('famous.angular')
  if (attrs.class) {
  isolate.renderNode.setClasses(attrs['class'].split(' '));
  }
+ $famousDecorator.sequenceWith(scope, function(data) {
+ throw new Error('Cannot add FA- elements in fa-surface');
+ });
  },
  post: function(scope, element, attrs){
  var isolate = $famousDecorator.ensureIsolate(scope);
 
  var updateContent = function() {
-  isolate.renderNode.setContent(element[0].querySelector('div.fa-surface'));
+  isolate.renderNode.setContent(element[0].querySelector('div.fa-surface'));
  };
 
  updateContent();
@@ -4110,6 +4113,8 @@ angular.module('famous.angular')
  $famousDecorator.registerChild(scope, element, isolate, function() {
  // TODO: hook into RenderController and hide this render node
  });
+
+
  }
  };
  }

diff --git a/dist/famous-angular.min.js b/dist/famous-angular.min.js
diff --git a/famous-angular-docs b/famous-angular-docs
diff --git a/famous-angular-examples b/famous-angular-examples
diff --git a/src/scripts/directives/fa-surface.js b/src/scripts/directives/fa-surface.js
@@ -204,12 +204,16 @@ angular.module('famous.angular')
  if (attrs.class) {
  isolate.renderNode.setClasses(attrs['class'].split(' '));
  }
+ // Throw an exception if anyother famous scene graph element is added on fa-surface. 
+ $famousDecorator.sequenceWith(scope, function(data) {
+ throw new Error('Fa-surface cannot contain a scene graph element unless enclosed in an fa-app');
+ });
  },
  post: function(scope, element, attrs){
  var isolate = $famousDecorator.ensureIsolate(scope);
 
  var updateContent = function() {
-  isolate.renderNode.setContent(element[0].querySelector('div.fa-surface'));
+  isolate.renderNode.setContent(element[0].querySelector('div.fa-surface'));
  };
 
  updateContent();
@@ -227,6 +231,8 @@ angular.module('famous.angular')
  $famousDecorator.registerChild(scope, element, isolate, function() {
  // TODO: hook into RenderController and hide this render node
  });
+
+
  }
  };
  }

diff --git a/src/scripts/famous b/src/scripts/famous