aboutsummaryrefslogtreecommitdiff
path: root/js/document/views/design.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-29 00:35:18 -0700
committerValerio Virgillito2012-05-29 00:35:18 -0700
commit0c9c719acb9381e147b90abbf733ad7eb3beb7f7 (patch)
treec50d4e0906c62386f6325f369edda9f1f0e697a1 /js/document/views/design.js
parent4c3aac5eabd93052b1554a03d78235215bb49db4 (diff)
parent58e454c828abf0b64fa62120359bcd78a0d34ac4 (diff)
downloadninja-0c9c719acb9381e147b90abbf733ad7eb3beb7f7.tar.gz
Merge branch 'refs/heads/dom-architecture' into document-bindings-fix
Diffstat (limited to 'js/document/views/design.js')
-rwxr-xr-xjs/document/views/design.js6
1 files changed, 2 insertions, 4 deletions
diff --git a/js/document/views/design.js b/js/document/views/design.js
index d772aa86..c7313708 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -67,13 +67,13 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
67 propertiesPanel: { 67 propertiesPanel: {
68 value: null 68 value: null
69 }, 69 },
70
71 //////////////////////////////////////////////////////////////////// 70 ////////////////////////////////////////////////////////////////////
72 // 71 //
73 _liveNodeList: { 72 _liveNodeList: {
74 value: null 73 value: null
75 }, 74 },
76 75 ////////////////////////////////////////////////////////////////////
76 //
77 getLiveNodeList: { 77 getLiveNodeList: {
78 value: function(useFilter) { 78 value: function(useFilter) {
79 if(useFilter) { 79 if(useFilter) {
@@ -93,8 +93,6 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
93 }, 93 },
94 //////////////////////////////////////////////////////////////////// 94 ////////////////////////////////////////////////////////////////////
95 // 95 //
96
97 //
98 initialize: { 96 initialize: {
99 value: function (parent) { 97 value: function (parent) {
100 //Creating iFrame for view 98 //Creating iFrame for view