Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture

3 files changed, 2 insertions, 21 deletions

diff --git a/js/components/menu/menu-item.reel/menu-item.js b/js/components/menu/menu-item.reel/menu-item.js
index 26fc7573..fc3913b8 100755
--- a/js/components/menu/menu-item.reel/menu-item.js
+++ b/js/components/menu/menu-item.reel/menu-item.js
@@ -141,7 +141,7 @@ exports.MenuItem = Montage.create(Component, {
 
             if(this.data.radio && this.checked) return;
 
-            if((this.enabled === true) && (this.submenu === false) ) {
+            if( ( this.enabled === true || this.enabled > 0 ) && (this.submenu === false) ) {
                 if(this.data.action) {
                     NJevent ( this.data.action );
                 } else  if(this.checked !== null) {
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index fba9fad5..1e894f02 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -76,24 +76,13 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
 
             this.eventManager.addEventListener("styleSheetDirty", this, false);
             
-            this.eventManager.addEventListener("addComponentFirstDraw", this, false);
-
             // Temporary add listeners for the new stage templates
             this.eventManager.addEventListener("executeWebpageOpen", this, false);
             this.eventManager.addEventListener("executeNewWebpage", this, false);
         }
     },
     
-    handleAddComponentFirstDraw: {
-        value: function (e) {
-                //TODO: Add logic to reparse the document for dynamically added styles
-                //console.log(e);
-        }
-    },
-    
-                        
-                        
-                        
+
         //TODO: Ensure these APIs are not needed
         ////////////////////////////////////////////////////////////////////
         //
diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js
index 53049cad..37fd9b44 100755
--- a/js/panels/components-panel.reel/components-panel.js
+++ b/js/panels/components-panel.reel/components-panel.js
@@ -295,8 +295,6 @@ exports.ComponentsPanel = Montage.create(Component, {
                     }
                 }
                 
-                instance.addEventListener('firstDraw', that, false);
-
                 that.application.ninja.currentDocument.model.setComponentInstance(instance, element);
 
                 that.application.ninja.elementMediator.addElements(element, styles);
@@ -304,12 +302,6 @@ exports.ComponentsPanel = Montage.create(Component, {
 
         }
     },
-    
-    handleFirstDraw: {
-        value: function (e) {
-                NJevent("addComponentFirstDraw");
-        }
-    },
 
     makeComponent: {
         value: function(name) {