diff options
| author | Eric Guzman | 2012-05-17 17:43:05 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-17 17:43:05 -0700 |
| commit | 458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7 (patch) | |
| tree | ee329e409fe28ae54c894b9e27e82e1f85aefc85 /js/data | |
| parent | 82954f400f7f8609aef0d2bc1f44c9d960907be6 (diff) | |
| parent | 52394cdd71bd62c8c109fd135fa146b7183fbd1f (diff) | |
| download | ninja-458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7.tar.gz | |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts:
js/document/templates/montage-html/default_html.css
js/lib/NJUtils.js
Diffstat (limited to 'js/data')
| -rwxr-xr-x | js/data/menu-data.js | 47 | ||||
| -rwxr-xr-x | js/data/pi/pi-data.js | 18 |
2 files changed, 12 insertions, 53 deletions
diff --git a/js/data/menu-data.js b/js/data/menu-data.js index 9e8bf945..aeb95ccc 100755 --- a/js/data/menu-data.js +++ b/js/data/menu-data.js | |||
| @@ -36,11 +36,8 @@ exports.MenuData = Montage.create( Montage, { | |||
| 36 | "enabled": { | 36 | "enabled": { |
| 37 | "value": false, | 37 | "value": false, |
| 38 | "boundObj": "documentController", | 38 | "boundObj": "documentController", |
| 39 | "boundProperty": "activeDocument", | 39 | "boundProperty": "_documents.count()", |
| 40 | "oneway": true, | 40 | "oneway": true |
| 41 | "boundValueMutator": function(activeDocument){ | ||
| 42 | return activeDocument !== null; | ||
| 43 | } | ||
| 44 | }, | 41 | }, |
| 45 | "action": "executeFileClose" | 42 | "action": "executeFileClose" |
| 46 | }, | 43 | }, |
| @@ -50,11 +47,8 @@ exports.MenuData = Montage.create( Montage, { | |||
| 50 | "enabled": { | 47 | "enabled": { |
| 51 | "value": false, | 48 | "value": false, |
| 52 | "boundObj": "documentController", | 49 | "boundObj": "documentController", |
| 53 | "boundProperty": "activeDocument", | 50 | "boundProperty": "_documents.count()", |
| 54 | "oneway": true, | 51 | "oneway": true |
| 55 | "boundValueMutator": function(activeDocument){ | ||
| 56 | return activeDocument !== null; | ||
| 57 | } | ||
| 58 | }, | 52 | }, |
| 59 | "action": "executeFileCloseAll" | 53 | "action": "executeFileCloseAll" |
| 60 | }, | 54 | }, |
| @@ -68,11 +62,8 @@ exports.MenuData = Montage.create( Montage, { | |||
| 68 | "enabled": { | 62 | "enabled": { |
| 69 | "value": false, | 63 | "value": false, |
| 70 | "boundObj": "documentController", | 64 | "boundObj": "documentController", |
| 71 | "boundProperty": "activeDocument", | 65 | "boundProperty": "_documents.count()", |
| 72 | "oneway": true, | 66 | "oneway": true |
| 73 | "boundValueMutator": function(activeDocument){ | ||
| 74 | return activeDocument !== null; | ||
| 75 | } | ||
| 76 | }, | 67 | }, |
| 77 | "action": "executeSave" | 68 | "action": "executeSave" |
| 78 | }, | 69 | }, |
| @@ -82,11 +73,8 @@ exports.MenuData = Montage.create( Montage, { | |||
| 82 | "enabled": { | 73 | "enabled": { |
| 83 | "value": false, | 74 | "value": false, |
| 84 | "boundObj": "documentController", | 75 | "boundObj": "documentController", |
| 85 | "boundProperty": "activeDocument", | 76 | "boundProperty": "_documents.count()", |
| 86 | "oneway": true, | 77 | "oneway": true |
| 87 | "boundValueMutator": function(activeDocument) { | ||
| 88 | return activeDocument !== null; | ||
| 89 | } | ||
| 90 | }, | 78 | }, |
| 91 | "action":"executeSaveAs" | 79 | "action":"executeSaveAs" |
| 92 | }, | 80 | }, |
| @@ -96,11 +84,8 @@ exports.MenuData = Montage.create( Montage, { | |||
| 96 | "enabled": { | 84 | "enabled": { |
| 97 | "value": false, | 85 | "value": false, |
| 98 | "boundObj": "documentController", | 86 | "boundObj": "documentController", |
| 99 | "boundProperty": "activeDocument", | 87 | "boundProperty": "_documents.count()", |
| 100 | "oneway": true, | 88 | "oneway": true |
| 101 | "boundValueMutator": function(activeDocument){ | ||
| 102 | return activeDocument !== null; | ||
| 103 | } | ||
| 104 | }, | 89 | }, |
| 105 | "action": "executeSaveAll" | 90 | "action": "executeSaveAll" |
| 106 | }, | 91 | }, |
| @@ -130,18 +115,6 @@ exports.MenuData = Montage.create( Montage, { | |||
| 130 | { | 115 | { |
| 131 | "displayText" : "", | 116 | "displayText" : "", |
| 132 | "separator": true | 117 | "separator": true |
| 133 | }, | ||
| 134 | { | ||
| 135 | "displayText" : "New Webpage", | ||
| 136 | "hasSubMenu" : false, | ||
| 137 | "enabled": true, | ||
| 138 | "action": "executeNewWebpage" | ||
| 139 | }, | ||
| 140 | { | ||
| 141 | "displayText" : "Open Webpage", | ||
| 142 | "hasSubMenu" : false, | ||
| 143 | "enabled": true, | ||
| 144 | "action": "executeWebpageOpen" | ||
| 145 | } | 118 | } |
| 146 | ] | 119 | ] |
| 147 | }, | 120 | }, |
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index d1dc9f34..157cbc64 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js | |||
| @@ -14,25 +14,11 @@ exports.PiData = Montage.create( Montage, { | |||
| 14 | { | 14 | { |
| 15 | label: "Style", | 15 | label: "Style", |
| 16 | 16 | ||
| 17 | Section: [ | ||
| 18 | [ | ||
| 19 | |||
| 20 | ] | ||
| 21 | ] | ||
| 22 | } | ||
| 23 | ] | ||
| 24 | }, | ||
| 25 | |||
| 26 | stagePi: { | ||
| 27 | value: [ | ||
| 28 | { | ||
| 29 | label: "Style", | ||
| 30 | |||
| 31 | Section: [ | 17 | Section: [ |
| 32 | [ | 18 | [ |
| 33 | { | 19 | { |
| 34 | type : "chip", | 20 | type: "chip", |
| 35 | id : "background", | 21 | id: "background", |
| 36 | prop: "background" | 22 | prop: "background" |
| 37 | } | 23 | } |
| 38 | ] | 24 | ] |