aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-05-16 11:37:25 -0700
committerJose Antonio Marquez2012-05-16 11:37:25 -0700
commit78250b70bdf0089e2b8ac56fb77e2f76ab83f34c (patch)
tree90f47e970993b659c25ca1ab190f554655b57d32 /js/controllers
parent5de553a1b3bdd8783ab6ce017ae70369ad92a890 (diff)
parent80f2b57b2126bbe90ce6ab3663ac04ffcc40a393 (diff)
downloadninja-78250b70bdf0089e2b8ac56fb77e2f76ab83f34c.tar.gz
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/controllers')
-rwxr-xr-xjs/controllers/styles-controller.js11
1 files changed, 5 insertions, 6 deletions
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 26485508..ae504f0e 100755
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -53,11 +53,11 @@ var stylesController = exports.StylesController = Montage.create(Component, {
53 ///// Bind app's activeDocument property to 53 ///// Bind app's activeDocument property to
54 ///// styles controller's _activeDocument property 54 ///// styles controller's _activeDocument property
55 55
56 Object.defineBinding(this, "activeDocument", { 56// Object.defineBinding(this, "activeDocument", {
57 boundObject: this.application.ninja, 57// boundObject: this.application.ninja,
58 boundObjectPropertyPath: "currentDocument", 58// boundObjectPropertyPath: "currentDocument",
59 oneway: true 59// oneway: true
60 }); 60// });
61 } 61 }
62 }, 62 },
63 63
@@ -79,7 +79,6 @@ var stylesController = exports.StylesController = Montage.create(Component, {
79 return this._activeDocument; 79 return this._activeDocument;
80 }, 80 },
81 set : function(document) { 81 set : function(document) {
82
83 ///// If the document is null set default stylesheets to null 82 ///// If the document is null set default stylesheets to null
84 83
85 if(!document) { 84 if(!document) {