aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mayhew2012-02-16 17:25:30 -0800
committerJohn Mayhew2012-02-16 17:25:30 -0800
commit9bba936942dcc6cbda66d72110548e29866285d3 (patch)
tree97d5a13e7e7ea6723ee91cab68f1f4e8fc427a88
parenta66bf533daccc3b850b7af12d7fd335fbd406beb (diff)
parentf0590347bc5fe810838b14a6035fbef35b5616c5 (diff)
downloadninja-9bba936942dcc6cbda66d72110548e29866285d3.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
-rw-r--r--.gitignore7
-rwxr-xr-xcss/ninja.css4
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.css1
-rwxr-xr-xjs/data/menu-data.js9
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.js2
-rwxr-xr-xjs/models/app-model.js13
-rwxr-xr-xjs/panels/PanelContainer/PanelContainer.reel/PanelContainer.js4
-rw-r--r--js/panels/presets/content.reel/content.css52
-rw-r--r--js/panels/presets/content.reel/content.html66
-rw-r--r--js/panels/presets/content.reel/content.js79
-rw-r--r--js/panels/presets/default-style-presets.js72
-rw-r--r--js/panels/presets/default-transition-presets.js93
-rw-r--r--js/panels/presets/presets-panel.js15
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.css0
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.html59
-rw-r--r--js/panels/presets/style-presets.reel/style-presets.js79
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.css0
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.html58
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.js46
-rwxr-xr-xjs/stage/stage-view.reel/stage-view.js8
-rwxr-xr-xscss/imports/scss/_MainWindow.scss10
-rw-r--r--scss/imports/scss/_Stage.scss13
22 files changed, 670 insertions, 20 deletions
diff --git a/.gitignore b/.gitignore
index 6c288e8c..40248468 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,9 +8,6 @@ images/treeControl/Thumbs.db
8.DS_Store 8.DS_Store
9.project 9.project
10 10
11_scss/compass_app_log.txt
12_scss/.sass-cache
13
14js/panels/Color/colorpanelpopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc 11js/panels/Color/colorpanelpopup.reel/.sass-cache/2fbca323ccf38cf180e7675ba0d8d3e07adeffea/ColorPanelPopup.scssc
15js/panels/Color/colorpanelpopup.reel/compass_app_log.txt 12js/panels/Color/colorpanelpopup.reel/compass_app_log.txt
16js/panels/Color/colorpanelbase.reel/compass_app_log.txt 13js/panels/Color/colorpanelbase.reel/compass_app_log.txt
@@ -21,6 +18,6 @@ js/components/gradientpicker.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78
21cloud/ 18cloud/
22 19
23/.idea/scopes/scope_settings.xml 20/.idea/scopes/scope_settings.xml
24_scss/imports/scss/_Stage.scss
25compass_app_log.txt 21compass_app_log.txt
26js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc \ No newline at end of file 22js/io/ui/cloudpopup.reel/.sass-cache/5fd824121af95f6044b06681535cf0639ffb5db3/cloudpopup.scssc
23scss/.sass-cache/ \ No newline at end of file
diff --git a/css/ninja.css b/css/ninja.css
index 824a675a..96ae6caf 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -118,9 +118,9 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
118 118
119#sceneBar { height: 70px; background-color: #474747; } 119#sceneBar { height: 70px; background-color: #474747; }
120 120
121#mainContainer #rulerTop { background: url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; display:none;} 121#mainContainer #rulerTop { background: gray; height: 15px; margin-bottom: 0px; }
122 122
123#rulerLeft { background: url("../images/temp/ruler-left.png"); width: 16px; display:none;} 123#rulerLeft { background: gray; width: 16px; }
124 124
125#stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; } 125#stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; }
126 126
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.css b/js/components/treeview/ninja-branch.reel/ninja-branch.css
index a3a9350e..340233c7 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.css
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.css
@@ -26,7 +26,6 @@
26 cursor: pointer; 26 cursor: pointer;
27 font-weight: bold; 27 font-weight: bold;
28 padding: 3px 0 4px; 28 padding: 3px 0 4px;
29 text-shadow: 1px 1px 1px #000;
30} 29}
31 30
32/* First Level */ 31/* First Level */
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index 3a065958..6503e776 100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -352,6 +352,15 @@ exports.MenuData = Montage.create( Montage, {
352 } 352 }
353 }, 353 },
354 { 354 {
355 "displayText" : "Presets",
356 "hasSubMenu" : false,
357 "enabled": true,
358 "checked": {
359 "value": true,
360 "boundProperty": "PresetsPanel"
361 }
362 },
363 {
355 "displayText" : "Code", 364 "displayText" : "Code",
356 "hasSubMenu" : false, 365 "hasSubMenu" : false,
357 "enabled": true 366 "enabled": true
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js
index 62f7e522..a2283d46 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.js
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.js
@@ -90,7 +90,7 @@ exports.CloudPopup = Montage.create(Component, {
90 value: function() { 90 value: function() {
91 if(this._os === 'mac') { 91 if(this._os === 'mac') {
92 location.href = '/ninja_localcloud_for_mac.zip'; 92 location.href = '/ninja_localcloud_for_mac.zip';
93 } else if (this._os === 'win') { 93 } else if (this._os === 'windows') {
94 location.href = '/ninja_localcloud_for_windows.zip'; 94 location.href = '/ninja_localcloud_for_windows.zip';
95 } else { 95 } else {
96 alert('Your operating system is not supported by the Ninja Local Cloud App.'); 96 alert('Your operating system is not supported by the Ninja Local Cloud App.');
diff --git a/js/models/app-model.js b/js/models/app-model.js
index 57394bb9..bfa1871c 100755
--- a/js/models/app-model.js
+++ b/js/models/app-model.js
@@ -325,6 +325,19 @@ exports.AppModel = Montage.create(Component, {
325 } 325 }
326 }, 326 },
327 327
328 _presetsPanel: {
329 value: true
330 },
331
332 PresetsPanel: {
333 get: function() {
334 return this._presetsPanel;
335 },
336 set: function(value) {
337 this._presetsPanel = value;
338 }
339 },
340
328 _materials: { 341 _materials: {
329 value: [] 342 value: []
330 }, 343 },
diff --git a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
index 66333cc0..b8223471 100755
--- a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
+++ b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
@@ -15,6 +15,7 @@ var CSSPanel = require("js/panels/CSSPanel/CSSPanel").CSSPanel;
15var ComponentsPanel = require("js/panels/Components/ComponentsPanel").ComponentsPanel; 15var ComponentsPanel = require("js/panels/Components/ComponentsPanel").ComponentsPanel;
16var ProjectPanel = require("js/panels/Project/ProjectPanel").ProjectPanel; 16var ProjectPanel = require("js/panels/Project/ProjectPanel").ProjectPanel;
17var MaterialsPanel = require("js/panels/Materials/MaterialsPanel").MaterialsPanel; 17var MaterialsPanel = require("js/panels/Materials/MaterialsPanel").MaterialsPanel;
18var PresetsPanel = require("js/panels/presets/presets-panel").PresetsPanel;
18 19
19exports.PanelContainer = Montage.create(Component, { 20exports.PanelContainer = Montage.create(Component, {
20 lastOffset: { 21 lastOffset: {
@@ -44,7 +45,7 @@ exports.PanelContainer = Montage.create(Component, {
44 }, 45 },
45 46
46 initPanelOrder: { 47 initPanelOrder: {
47 value: ['PropertiesPanel','ColorPanel','ComponentsPanel','ProjectPanel','CSSPanel','MaterialsPanel'] 48 value: ['PropertiesPanel','ColorPanel','ComponentsPanel','ProjectPanel','CSSPanel','MaterialsPanel','PresetsPanel']
48 }, 49 },
49 50
50 panelOrder: { 51 panelOrder: {
@@ -99,6 +100,7 @@ exports.PanelContainer = Montage.create(Component, {
99 this.addEventListener("change@appModel.ComponentsPanel", this, false); 100 this.addEventListener("change@appModel.ComponentsPanel", this, false);
100 this.addEventListener("change@appModel.CSSPanel", this, false); 101 this.addEventListener("change@appModel.CSSPanel", this, false);
101 this.addEventListener("change@appModel.MaterialsPanel", this, false); 102 this.addEventListener("change@appModel.MaterialsPanel", this, false);
103 this.addEventListener("change@appModel.PresetsPanel", this, false);
102 } 104 }
103 }, 105 },
104 106
diff --git a/js/panels/presets/content.reel/content.css b/js/panels/presets/content.reel/content.css
new file mode 100644
index 00000000..08e1d53b
--- /dev/null
+++ b/js/panels/presets/content.reel/content.css
@@ -0,0 +1,52 @@
1.presetsPanel {
2 display: -webkit-box;
3 text-shadow: 1px 1px 1px #000;
4 -webkit-box-orient: vertical;
5 -webkit-box-flex: 1;
6}
7.presetsPanel .treeRoot {
8 margin: 0 8px;
9}
10.tab-bar {
11 -webkit-box-flex: 0;
12 background-color: #282828;
13 color: #FFF;
14 display: -webkit-box;
15 font-size: 12px;
16 -webkit-box-orient: horizontal;
17}
18
19.tab-bar div {
20 -webkit-box-flex: 0;
21 border-top-right-radius: 2px;
22 border-top-left-radius: 2px;
23 background-color: #474747;
24 background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.2) 0,rgba(0,0,0,0) 3px);
25 border-top: 1px solid rgb(100, 100, 100);
26 border-left: 1px solid rgba(100, 100, 100, 0.3);
27 border-right: 1px solid rgba(100, 100, 100, 0.3);
28 padding: 4px 9px;
29 cursor: pointer;
30 opacity: 0.6;
31 white-space: nowrap;
32 text-overflow: ellipsis;
33 overflow: hidden;
34 position: relative;
35 z-index: 999;
36}
37.tab-bar div.active-tab {
38 background-image: none;
39 box-shadow: 0 -5px 2px 3px rgba(0,0,0,0.2);
40 position: relative;
41 opacity: 1;
42 text-overflow: clip;
43 z-index: 1001;
44}