aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Guzman2012-02-16 14:20:40 -0800
committerEric Guzman2012-02-16 14:20:40 -0800
commit6960f62a84b946c92a59e5f5dc537a818f9f62b8 (patch)
tree49cbff3fdd8dab11846e5a278406915ec0ec1508
parent82b1a273219f0ae3d119e156c7acccdbe478f441 (diff)
parent81942bd52f0713c9ff5d479ebd12fce577f45e45 (diff)
downloadninja-6960f62a84b946c92a59e5f5dc537a818f9f62b8.tar.gz
Merge branch 'refs/heads/master' into PresetsPanel
-rw-r--r--assets/descriptor.json34
-rwxr-xr-xcss/ninja.css6
-rw-r--r--js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css3
-rw-r--r--js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js32
-rw-r--r--js/components/ui/icon-list-basic/icon.reel/icon.css16
-rwxr-xr-xjs/controllers/document-controller.js71
-rwxr-xr-xjs/document/controllers/base-controller.js32
-rwxr-xr-xjs/document/html-document.js (renamed from js/io/document/html-document.js)47
-rwxr-xr-xjs/document/mediators/base-mediator.js32
-rwxr-xr-xjs/document/models/base-model.js32
-rwxr-xr-xjs/document/text-document.js195
-rwxr-xr-xjs/document/views/base-view.js32
-rwxr-xr-xjs/io/document/base-document.js93
-rwxr-xr-xjs/io/document/text-document.js156
-rwxr-xr-xjs/io/system/coreioapi.js18
-rw-r--r--js/io/system/ninjalibrary.js25
-rw-r--r--js/io/system/ninjalibrary.json5
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.css57
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.html4
-rw-r--r--js/mediators/io-mediator.js47
-rwxr-xr-xjs/ninja.reel/ninja.css2
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css6
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html11
-rwxr-xr-xjs/stage/stage-view.reel/stage-view.js5
-rwxr-xr-xnode_modules/montage/core/converter/converter.js10
-rwxr-xr-xnode_modules/montage/core/converter/date-converter.js10
-rwxr-xr-xnode_modules/montage/core/core.js42
-rwxr-xr-xnode_modules/montage/core/deserializer.js4
-rwxr-xr-xnode_modules/montage/core/event/binding.js8
-rwxr-xr-xnode_modules/montage/core/event/event-manager.js5
-rwxr-xr-xnode_modules/montage/core/event/mutable-event.js1
-rwxr-xr-xnode_modules/montage/core/promise.js36
-rwxr-xr-xnode_modules/montage/core/shim/string.js15
-rw-r--r--[-rwxr-xr-x]node_modules/montage/core/undo-manager.js0
-rw-r--r--[-rwxr-xr-x]node_modules/montage/core/url.js0
-rwxr-xr-xnode_modules/montage/data/context.js5
-rwxr-xr-xnode_modules/montage/montage.js2
-rw-r--r--node_modules/montage/node.js5
-rwxr-xr-xnode_modules/montage/package.json2
-rwxr-xr-xnode_modules/montage/require/browser.js28
-rw-r--r--node_modules/montage/require/node.js5
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/bluemoon/progress.reel/progress.html0
-rw-r--r--node_modules/montage/ui/button.reel/button.js206
-rw-r--r--node_modules/montage/ui/check-input.js93
-rwxr-xr-xnode_modules/montage/ui/component.js6
-rw-r--r--node_modules/montage/ui/composer/composer.js1
-rw-r--r--node_modules/montage/ui/composer/press-composer.js434
-rwxr-xr-xnode_modules/montage/ui/condition.reel/condition.js68
-rw-r--r--node_modules/montage/ui/date-input.reel/date-input.js20
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/flow-path-cubic.js6
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/flow-path-lerp.js6
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/flow-path-linear.js6
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/flow-path-sigmoid.js6
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/flow-path.js6
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/flow.reel/flow.html0
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/flow.reel/flow.js6
-rw-r--r--node_modules/montage/ui/native-control.js175
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/nearest-neighbor-component-search.js6
-rw-r--r--node_modules/montage/ui/number-input.reel/number-input.js9
-rwxr-xr-xnode_modules/montage/ui/radio-button.reel/radio-button.js19
-rw-r--r--node_modules/montage/ui/range-input.reel/range-input.js48
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/scroll-bars.reel/scroll-bars.html0
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/scroll-bars.reel/scroll-bars.js6
-rwxr-xr-xnode_modules/montage/ui/scroll.js6
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/scroller.reel/scroller.html0
-rw-r--r--[-rwxr-xr-x]node_modules/montage/ui/scroller.reel/scroller.js6
-rwxr-xr-xnode_modules/montage/ui/scrollview.reel/scrollview.js43
-rw-r--r--node_modules/montage/ui/select-input.reel/select-input.js53
-rw-r--r--node_modules/montage/ui/text-input.js109
-rw-r--r--node_modules/montage/ui/textfield.reel/textfield.js5
-rw-r--r--node_modules/montage/ui/toggle-button.reel/toggle-button.js4
-rwxr-xr-xnode_modules/montage/ui/toggle-switch.reel/toggle-switch.css162
-rwxr-xr-xnode_modules/montage/ui/toggle-switch.reel/toggle-switch.html16
-rw-r--r--node_modules/montage/ui/toggle-switch.reel/toggle-switch.js424
-rwxr-xr-xscss/imports/scss/_MainWindow.scss8
75 files changed, 1625 insertions, 1477 deletions
diff --git a/assets/descriptor.json b/assets/descriptor.json
new file mode 100644
index 00000000..53bfb684
--- /dev/null
+++ b/assets/descriptor.json
@@ -0,0 +1,34 @@
1{
2 "copyright": "This file contains proprietary software owned by Motorola Mobility, Inc. No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder. (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.",
3 "version": "0.0.0.0",
4 "root": "/assets/",
5 "directories": [{"name": "images"}, {"name": "shaders"}],
6 "files": [
7 "images/black.png",
8 "images/blue.png",
9 "images/BoxB2_AO.png",
10 "images/BoxB2_DM.png",
11 "images/cubelight.png",
12 "images/grey.png",
13 "images/material_paint.png",
14 "images/metal.png",
15 "images/normalMap.png",
16 "images/random_normal.png",
17 "images/rocky-diffuse.jpg",
18 "images/rocky-normal.jpg",
19 "images/rocky-spec.jpg",
20 "images/silver.png",
21 "images/white.png",
22 "shaders/Basic.frag.glsl",
23 "shaders/Basic.vert.glsl",
24 "shaders/linearGradient.frag.glsl",
25 "shaders/linearGradient.vert.glsl",
26 "shaders/radialGradient.frag.glsl",
27 "shaders/radialGradient.vert.glsl",
28 "shaders/test_fshader.glsl",
29 "shaders/test_fshader_full.glsl",
30 "shaders/test_vshader.glsl",
31 "shaders/ub_fshader.glsl",
32 "shaders/ub_vshader.glsl"
33 ]
34} \ No newline at end of file
diff --git a/css/ninja.css b/css/ninja.css
index d22cfc22..824a675a 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; } 121#mainContainer #rulerTop { background: url("../images/temp/ruler-top.png"); height: 15px; margin-bottom: 0px; display:none;}
122 122
123#rulerLeft { background: url("../images/temp/ruler-left.png"); width: 16px; } 123#rulerLeft { background: url("../images/temp/ruler-left.png"); width: 16px; display:none;}
124 124
125#stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; } 125#stateBar { height: 20px; background-color: #282828; margin-bottom: 0px; }
126 126
@@ -174,6 +174,8 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
174 174
175#documentBar { height: 25px; width: 1000px; position: relative; overflow: hidden; color: white; } 175#documentBar { height: 25px; width: 1000px; position: relative; overflow: hidden; color: white; }
176 176
177.montage-popup-modal-mask { opacity: 1; background: -webkit-radial-gradient(center, ellipse cover, rgba(0, 0, 0, 0.65) 0%, rgba(0, 0, 0, 0.8) 80%); }
178
177#middleDocArea { -webkit-box-orient: horizontal; -moz-box-orient: horizontal; box-orient: horizontal; -moz-box-flex: 1; -webkit-box-flex: 1; box-flex: 1; margin: 1px; margin-bottom: 3px; border-style: solid; border-width: 1px; } 179#middleDocArea { -webkit-box-orient: horizontal; -moz-box-orient: horizontal; box-orient: horizontal; -moz-box-flex: 1; -webkit-box-flex: 1; box-flex: 1; margin: 1px; margin-bottom: 3px; border-style: solid; border-width: 1px; }
178 180
179#mainStageIFrame { border: none; margin: 4px; } 181#mainStageIFrame { border: none; margin: 4px; }
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
index 9c85c6b5..796c283f 100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
@@ -6,7 +6,7 @@
6 6
7.picker{ 7.picker{
8 font-size:12px; 8 font-size:12px;
9 width:510px; 9 width:523px;
10 height:500px; 10 height:500px;
11 padding-top:15px; 11 padding-top:15px;
12 padding-left:15px; 12 padding-left:15px;
@@ -53,6 +53,7 @@
53 height:75%; 53 height:75%;
54 width:auto; 54 width:auto;
55 border-right: none; 55 border-right: none;
56 margin: 8px 0px 0px 8px;
56} 57}
57 58
58.picker .right-bottom{ 59.picker .right-bottom{
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
index 6b0d92f7..411386f9 100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
@@ -203,6 +203,13 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
203 this.pickerModel.storeHistory(this.pickerModel.currentRoot);//populate history 203 this.pickerModel.storeHistory(this.pickerModel.currentRoot);//populate history
204