From 1fa1faf9119e4dd048bd52fd44ab754b6942c319 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Mon, 4 Jun 2012 15:32:20 -0700 Subject: Fixing saveAll from menu This was broken, not sure when it broke, but working again. --- js/controllers/document-controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/controllers') diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index a90375af..bb0041eb 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -174,9 +174,9 @@ exports.DocumentController = Montage.create(Component, { handleExecuteSaveAll: { value: function(event) { // - if((typeof this.activeDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){ + if((typeof this.currentDocument !== "undefined") && this.application.ninja.coreIoApi.cloudAvailable()){ // - this.activeDocument.model.saveAll(); + this.currentDocument.model.saveAll(); } else { //TODO: Add error handling } -- cgit v1.2.3 From 563935933c191093b8ccd88fd1377775c5641b0d Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Mon, 4 Jun 2012 23:33:32 -0700 Subject: components fix: adding a first draw event to components Adding a first draw allows the component to have the right element so that ninja can use it's controller to get the component instance Signed-off-by: Valerio Virgillito --- js/controllers/elements/component-controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js/controllers') diff --git a/js/controllers/elements/component-controller.js b/js/controllers/elements/component-controller.js index 5b0aaeac..dd0766df 100755 --- a/js/controllers/elements/component-controller.js +++ b/js/controllers/elements/component-controller.js @@ -11,7 +11,7 @@ exports.ComponentController = Montage.create(ElementController, { getProperty: { value: function(el, prop) { - var component = el.controller || this.application.ninja.currentDocument.model.getComponentFromElement(el); + var component = el.controller; switch(prop) { case "id": @@ -34,7 +34,7 @@ exports.ComponentController = Montage.create(ElementController, { setProperty: { value: function(el, p, value) { - var component = el.controller || this.application.ninja.currentDocument.model.getComponentFromElement(el); + var component = el.controller; switch(p) { case "id": -- cgit v1.2.3