From db6c0d20eba328408b37b65e67215d1866100c18 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 27 Mar 2012 11:34:06 -0700 Subject: removed trace statement Signed-off-by: Valerio Virgillito --- js/controllers/document-controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/controllers') diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index d5556fa8..b6d9dc67 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -71,7 +71,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component, handleAddComponentFirstDraw: { value: function (e) { //TODO: Add logic to reparse the document for dynamically added styles - console.log(e); + //console.log(e); } }, -- cgit v1.2.3 From bacc278a3729f4e6fd6ebb9971d6d47a90e58b36 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Wed, 4 Apr 2012 12:22:14 -0700 Subject: Presets Controller - Update to not use "_element" property of selection. --- js/controllers/presets-controller.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'js/controllers') diff --git a/js/controllers/presets-controller.js b/js/controllers/presets-controller.js index 975f9f7a..4c177189 100644 --- a/js/controllers/presets-controller.js +++ b/js/controllers/presets-controller.js @@ -72,20 +72,19 @@ exports.PresetsController = Montage.create(Component, { selectorBase = stylesController.generateClassName(selectorBase); selection.forEach(function(element) { - var el = element._element, - animationName; + var animationName; if(useTransition) { - this.addTransition(el); + this.addTransition(element); } ///// TODO: remove when we find out what to do with competing animations - animationName = stylesController.getElementStyle(el, '-webkit-animation-name'); + animationName = stylesController.getElementStyle(element, '-webkit-animation-name'); if(animationName) { animationNames.push(animationName); } - el.classList.add(selectorBase); + element.classList.add(selectorBase); }, this); -- cgit v1.2.3 From d5b429f4d1fad1f9b83e81d2d742d43ec39bd585 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Wed, 4 Apr 2012 15:14:33 -0700 Subject: [CR] Keep Save related menu items always enabled, if there is an open document Signed-off-by: Ananya Sen --- js/controllers/document-controller.js | 9 --------- 1 file changed, 9 deletions(-) (limited to 'js/controllers') diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index a308f191..0f02ca3c 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js @@ -32,9 +32,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component, _iframeHolder: { value: null, enumerable: false }, _textHolder: { value: null, enumerable: false }, _codeMirrorCounter: {value: 1, enumerable: false}, - - canSave:{value: false},//for Save menu state update - canSaveAll:{value: false},//for Save All menu state update activeDocument: { get: function() { @@ -50,12 +47,6 @@ var DocumentController = exports.DocumentController = Montage.create(Component, if(!!this._activeDocument.editor){ this._activeDocument.editor.focus(); } - - this.canSave = doc.needsSave; - this.canSaveAll = doc.needsSave; - }else{ - this.canSave = false; - this.canSaveAll = false; } } }, -- cgit v1.2.3