diff options
Diffstat (limited to 'js')
75 files changed, 2842 insertions, 2375 deletions
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html index 2c91ca13..4448e1f1 100644 --- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html +++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "codeCompleteCheck":{ | 13 | "codeCompleteCheck":{ |
| 14 | "prototype": "montage/ui/checkbox.reel", | 14 | "prototype": "montage/ui/input-checkbox.reel", |
| 15 | "properties": { | 15 | "properties": { |
| 16 | "element": {"#": "codeComplete"} | 16 | "element": {"#": "codeComplete"} |
| 17 | }, | 17 | }, |
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html index 68f3be2b..ee314628 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | }, | 21 | }, |
| 22 | 22 | ||
| 23 | "breadCrumbButton": { | 23 | "breadCrumbButton": { |
| 24 | "prototype": "montage/ui/button.reel", | 24 | "prototype": "montage/ui/native/button.reel", |
| 25 | "properties": { | 25 | "properties": { |
| 26 | "element": {"#": "breadcrumb_button"} | 26 | "element": {"#": "breadcrumb_button"} |
| 27 | }, | 27 | }, |
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html index e68d17c5..ebaa4ccd 100755 --- a/js/components/layout/document-entry.reel/document-entry.html +++ b/js/components/layout/document-entry.reel/document-entry.html | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | }, | 20 | }, |
| 21 | 21 | ||
| 22 | "closeButton": { | 22 | "closeButton": { |
| 23 | "prototype": "montage/ui/button.reel", | 23 | "prototype": "montage/ui/native/button.reel", |
| 24 | "properties": { | 24 | "properties": { |
| 25 | "element": {"#": "close-btn"}, | 25 | "element": {"#": "close-btn"}, |
| 26 | "identifier": "closeButton" | 26 | "identifier": "closeButton" |
diff --git a/js/components/menu/menu-entry.reel/menu-entry.js b/js/components/menu/menu-entry.reel/menu-entry.js index b9c546ed..0f5503f6 100755 --- a/js/components/menu/menu-entry.reel/menu-entry.js +++ b/js/components/menu/menu-entry.reel/menu-entry.js | |||
| @@ -9,18 +9,15 @@ var Component = require("montage/ui/component").Component; | |||
| 9 | 9 | ||
| 10 | exports.MenuEntry = Montage.create(Component, { | 10 | exports.MenuEntry = Montage.create(Component, { |
| 11 | topHeader: { | 11 | topHeader: { |
| 12 | value: null, | 12 | value: null |
| 13 | serializable: true | ||
| 14 | }, | 13 | }, |
| 15 | 14 | ||
| 16 | topHeaderText: { | 15 | topHeaderText: { |
| 17 | value: null, | 16 | value: null |
| 18 | serializable: true | ||
| 19 | }, | 17 | }, |
| 20 | 18 | ||
| 21 | subEntries: { | 19 | subEntries: { |
| 22 | value: null, | 20 | value: null |
| 23 | serializable: true | ||
| 24 | }, | 21 | }, |
| 25 | 22 | ||
| 26 | // Reference to the parent Menu component | 23 | // Reference to the parent Menu component |
| @@ -36,8 +33,7 @@ exports.MenuEntry = Montage.create(Component, { | |||
| 36 | if(value !== this._menu) { | 33 | if(value !== this._menu) { |
| 37 | this._menu = value; | 34 | this._menu = value; |
| 38 | } | 35 | } |
| 39 | }, | 36 | } |
| 40 | serializable: true | ||
| 41 | }, | 37 | }, |
| 42 | 38 | ||
| 43 | _data: { | 39 | _data: { |
| @@ -52,8 +48,7 @@ exports.MenuEntry = Montage.create(Component, { | |||
| 52 | if(this._data !== value) { | 48 | if(this._data !== value) { |
| 53 | this._data = value; | 49 | this._data = value; |
| 54 | } | 50 | } |
| 55 | }, | 51 | } |
| 56 | serializable: true | ||
| 57 | }, | 52 | }, |
| 58 | 53 | ||
| 59 | select: { | 54 | select: { |
| @@ -79,22 +74,20 @@ exports.MenuEntry = Montage.create(Component, { | |||
| 79 | return this._menuIsActive; | 74 | return this._menuIsActive; |
| 80 | }, | 75 | }, |
| 81 | set: function(value) { | 76 | |