diff options
| author | Armen Kesablyan | 2012-05-30 18:41:07 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-30 18:41:07 -0700 |
| commit | b7e33c16bab26f8ee0daa61f920cfdbcb7abc6e3 (patch) | |
| tree | 4629ccd709fd9b818ba4c8311dd19aa7b68a461e /js/document/views/design.js | |
| parent | a581fb3c544ee2faeafbb75f7a3f5719f53cf323 (diff) | |
| parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
| download | ninja-b7e33c16bab26f8ee0daa61f920cfdbcb7abc6e3.tar.gz | |
Merge branch 'refs/heads/master' into binding
Diffstat (limited to 'js/document/views/design.js')
| -rwxr-xr-x | js/document/views/design.js | 6 |
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 |