diff options
author | Jose Antonio Marquez | 2012-05-21 09:53:19 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-21 09:53:19 -0700 |
commit | c087ca289bc6d6eb26d0f5543ec6d1df1ba5dd4e (patch) | |
tree | 3d9b50fa845ba3d80fdc159275a9fece7ef69911 /js/controllers | |
parent | b844fb34e9500560adcc8f9e860f7328f4db014f (diff) | |
parent | 10471fc02fa75040baf337bc62ff683854793f81 (diff) | |
download | ninja-c087ca289bc6d6eb26d0f5543ec6d1df1ba5dd4e.tar.gz |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/controllers')
-rwxr-xr-x | js/controllers/document-controller.js | 2 | ||||
-rwxr-xr-x | js/controllers/elements/body-controller.js | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js index cf618360..f6b850b2 100755 --- a/js/controllers/document-controller.js +++ b/js/controllers/document-controller.js | |||
@@ -490,6 +490,8 @@ var DocumentController = exports.DocumentController = Montage.create(Component, | |||
490 | if(currentDocument) { | 490 | if(currentDocument) { |
491 | currentDocument.serializeDocument(); | 491 | currentDocument.serializeDocument(); |
492 | 492 | ||
493 | this.application.ninja.selectionController._selectionContainer = null; | ||
494 | currentDocument.model.views.design.propertiesPanel.clear(); | ||
493 | currentDocument.model.views.design.hide(); | 495 | currentDocument.model.views.design.hide(); |
494 | } | 496 | } |
495 | 497 | ||
diff --git a/js/controllers/elements/body-controller.js b/js/controllers/elements/body-controller.js index 5c23dcf7..7a3a66f5 100755 --- a/js/controllers/elements/body-controller.js +++ b/js/controllers/elements/body-controller.js | |||
@@ -30,7 +30,7 @@ exports.BodyController = Montage.create(ElementController, { | |||
30 | value: function(el, p) { | 30 | value: function(el, p) { |
31 | switch(p) { | 31 | switch(p) { |
32 | case "background" : | 32 | case "background" : |
33 | return this.application.ninja.colorController.getColorObjFromCss(this.application.ninja.stylesController.getElementStyle(el, "background-color", true, true)); | 33 | return this.application.ninja.colorController.getColorObjFromCss(this.application.ninja.stylesController.getElementStyle(el, "background-color", false, true)); |
34 | case "border": | 34 | case "border": |
35 | return 0; | 35 | return 0; |
36 | case "height": | 36 | case "height": |