aboutsummaryrefslogtreecommitdiff
path: root/js/document
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-05-21 09:53:19 -0700
committerJose Antonio Marquez2012-05-21 09:53:19 -0700
commitc087ca289bc6d6eb26d0f5543ec6d1df1ba5dd4e (patch)
tree3d9b50fa845ba3d80fdc159275a9fece7ef69911 /js/document
parentb844fb34e9500560adcc8f9e860f7328f4db014f (diff)
parent10471fc02fa75040baf337bc62ff683854793f81 (diff)
downloadninja-c087ca289bc6d6eb26d0f5543ec6d1df1ba5dd4e.tar.gz
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
Diffstat (limited to 'js/document')
-rwxr-xr-xjs/document/views/design.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/js/document/views/design.js b/js/document/views/design.js
index bd8c25ec..3f58650e 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -64,6 +64,11 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
64 }, 64 },
65 //////////////////////////////////////////////////////////////////// 65 ////////////////////////////////////////////////////////////////////
66 // 66 //
67 propertiesPanel: {
68 value: null
69 },
70 ////////////////////////////////////////////////////////////////////
71 //
67 initialize: { 72 initialize: {
68 value: function (parent) { 73 value: function (parent) {
69 //Creating iFrame for view 74 //Creating iFrame for view