aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-10 15:33:20 -0800
committerJose Antonio Marquez2012-02-10 15:33:20 -0800
commitf7f445e8ced728d04de4bf1c5711f6756488a71e (patch)
treeb09f00c28ff7123354af40509283ddec846f438d
parent632a5daca17acb774b9344ccc0e9107f1643924c (diff)
parent48977780443d97b9e97b047066639c9056788041 (diff)
downloadninja-f7f445e8ced728d04de4bf1c5711f6756488a71e.tar.gz
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
-rwxr-xr-xcss/ninja.css12
-rwxr-xr-xjs/components/button.reel/button.js2
-rw-r--r--js/components/editable.reel/editable.js250
-rw-r--r--js/components/hintable.reel/hintable.js360
-rwxr-xr-xjs/components/layout/bread-crumb.reel/bread-crumb.js108
-rwxr-xr-xjs/components/package.json8
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.css30
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html326
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.js236
-rwxr-xr-xjs/controllers/styles-controller.js4
-rwxr-xr-xjs/helper-classes/Utils.js33
-rwxr-xr-xjs/lib/NJUtils.js21
-rwxr-xr-xjs/mediators/element-mediator.js19
-rwxr-xr-xjs/ninja.reel/ninja.html12
-rwxr-xr-xjs/panels/CSSPanel/CSSPanel.js6
-rwxr-xr-xjs/panels/Resizer.js4
-rw-r--r--js/panels/Timeline/Collapser.js320
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.html27
-rw-r--r--js/panels/Timeline/Keyframe.reel/Keyframe.js154
-rw-r--r--js/panels/Timeline/Keyframe.reel/css/Keyframe.css15
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html168
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js626
-rw-r--r--js/panels/Timeline/Layer.reel/css/Layer.css322
-rw-r--r--js/panels/Timeline/Layer.reel/images/eye.pngbin0 -> 1331 bytes
-rw-r--r--js/panels/Timeline/Layer.reel/images/icon-collapsed.pngbin0 -> 325 bytes
-rw-r--r--js/panels/Timeline/Layer.reel/images/icon-eye.pngbin0 -> 550 bytes
-rw-r--r--js/panels/Timeline/Layer.reel/images/icon-lock.pngbin0 -> 475 bytes
-rw-r--r--js/panels/Timeline/Layer.reel/images/icon-minus.pngbin0 -> 161 bytes
-rw-r--r--js/panels/Timeline/Layer.reel/images/icon-open.pngbin0 -> 323 bytes
-rw-r--r--js/panels/Timeline/Layer.reel/images/icon-plus.pngbin0 -> 230 bytes
-rw-r--r--js/panels/Timeline/Layer.reel/images/lock_closed.pngbin0 -> 1208 bytes
-rw-r--r--js/panels/Timeline/Layer.reel/images/lock_open.pngbin0 -> 1186 bytes
-rw-r--r--js/panels/Timeline/Layer.reel/images/panelDisclosureIcon.pngbin0 -> 3028 bytes
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss220
-rw-r--r--js/panels/Timeline/Layer.reel/scss/config.rb9
-rw-r--r--js/panels/Timeline/Span.reel/Span.html27
-rw-r--r--js/panels/Timeline/Span.reel/Span.js41
-rw-r--r--js/panels/Timeline/Span.reel/css/Span.css11
-rw-r--r--js/panels/Timeline/Style.reel/Style.html91
-rw-r--r--js/panels/Timeline/Style.reel/Style.js648
-rw-r--r--js/panels/Timeline/Style.reel/css/Style.css133
-rw-r--r--js/panels/Timeline/Style.reel/scss/Style.scss70
-rw-r--r--js/panels/Timeline/Style.reel/scss/config.rb9
-rwxr-xr-xjs/panels/Timeline/TimelineController.js13
-rwxr-xr-xjs/panels/Timeline/TimelinePanel.reel/TimelinePanel.css6
-rwxr-xr-xjs/panels/Timeline/TimelinePanel.reel/TimelinePanel.html242
-rwxr-xr-xjs/panels/Timeline/TimelinePanel.reel/TimelinePanel.js1027
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/css/TimelinePanel.css251
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/pause.pngbin0 -> 1076 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/play.pngbin0 -> 1190 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/play_next.pngbin0 -> 1185 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/play_prev.pngbin0 -> 1199 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/plus.pngbin0 -> 1133 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/timetick.jpgbin0 -> 737 bytes
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/images/trash.pngbin0 -> 1154 bytes
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html112
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js433
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/css/TimelineTrack.css117
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/images/gridline.jpgbin0 -> 724 bytes
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/scss/TimelineTrack.scss65
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/scss/config.rb9
-rw-r--r--js/panels/Timeline/Track.reel/Track.html61
-rw-r--r--js/panels/Timeline/Track.reel/Track.js186
-rw-r--r--js/panels/Timeline/Track.reel/css/Track.css26
-rw-r--r--js/panels/Timeline/Track.reel/images/gridline.jpgbin0 -> 724 bytes
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html26
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js15
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css5
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.html48
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js109
-rw-r--r--js/panels/Timeline/Tween.reel/css/Tween.css4
-rwxr-xr-xjs/stage/stage.reel/stage.html12
-rwxr-xr-xjs/stage/stage.reel/stage.js7
-rwxr-xr-xjs/tools/TextTool.js97
-rw-r--r--node_modules/labs/rich-text-editor.reel/rich-text-editor.css112
-rw-r--r--node_modules/labs/rich-text-editor.reel/rich-text-editor.html27
-rw-r--r--node_modules/labs/rich-text-editor.reel/rich-text-editor.js1716
-rw-r--r--node_modules/labs/rich-text-editor.reel/rich-text-resizer.js349
-rw-r--r--node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js132
-rw-r--r--node_modules/labs/rich-text-editor.reel/shortcut-manager.js237
-rwxr-xr-xscss/imports/scss/_Base.scss2
-rwxr-xr-xscss/imports/scss/_MainWindow.scss7
-rwxr-xr-xscss/imports/scss/_PanelUI.scss2
-rw-r--r--scss/imports/scss/_Stage.scss14
-rwxr-xr-xscss/ninja.scss1
-rwxr-xr-xuser-document-templates/montage-application-cloud/default_html.css1
86 files changed, 9298 insertions, 495 deletions
diff --git a/css/ninja.css b/css/ninja.css
index a9a23d24..48590fc8 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -36,7 +36,7 @@ input[type="search"].nj-skinned::-webkit-search-cancel-button:after { content: "
36 36
37button.nj-skinned { font-size: 9px; cursor: pointer; display: block; border: 0px; margin: 0px; padding: 4px; border: 1px #313131 solid; background-color: #474747; background-image: -webkit-linear-gradient(top, #505050 0%, #3c3c3c 100%); border-radius: 4px; color: white; text-transform: uppercase; cursor: pointer; text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); } 37button.nj-skinned { font-size: 9px; cursor: pointer; display: block; border: 0px; margin: 0px; padding: 4px; border: 1px #313131 solid; background-color: #474747; background-image: -webkit-linear-gradient(top, #505050 0%, #3c3c3c 100%); border-radius: 4px; color: white; text-transform: uppercase; cursor: pointer; text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); }
38 38
39button.nj-skinned:active { background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #505050 100%); } 39button.nj-skinned:active, button.nj-skinned.active { background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #505050 100%); }
40 40
41button.nj-skinned:hover { -webkit-box-shadow: 0px 0px 3px #b4b4b4; } 41button.nj-skinned:hover { -webkit-box-shadow: 0px 0px 3px #b4b4b4; }
42 42
@@ -80,7 +80,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
80 80
81#topPanelContainer { overflow: hidden; margin-bottom: 2px; height: 32px; } 81#topPanelContainer { overflow: hidden; margin-bottom: 2px; height: 32px; }
82 82
83#bottomPanelContainer { background: transparent; min-height: 80px; max-height: 50%; overflow: auto; } 83#bottomPanelContainer { background: transparent; height: 150px; min-height: 80px; max-height: 50%; overflow: auto; }
84 84
85.panelContainer { display: block; -webkit-box-orient: vertical; position: relative; } 85.panelContainer { display: block; -webkit-box-orient: vertical; position: relative; }
86 86
@@ -164,8 +164,6 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
164 164
165#rightPanelContent { overflow-y: hidden; } 165#rightPanelContent { overflow-y: hidden; }
166 166
167.contextMenu { position: absolute; z-index: 999; }
168
169#openDocumentsTabComponent { height: 25px; position: relative; overflow: hidden; color: white; } 167#openDocumentsTabComponent { height: 25px; position: relative; overflow: hidden; color: white; }
170 168
171#openDocuments { float: left; height: 25px; width: 100%; font-size: 12px; list-style: none; margin: 0; padding: 0; position: relative; text-decoration: none; } 169#openDocuments { float: left; height: 25px; width: 100%; font-size: 12px; list-style: none; margin: 0; padding: 0; position: relative; text-decoration: none; }
@@ -212,6 +210,10 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
212 210
213#mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; } 211#mainContent .CodeMirror-scroll { height: 100%; overflow: scroll; overflow-x: auto; overflow-y: auto; }
214 212
213.montage-editor-frame { position: absolute; z-index: 7; top: 0; left: 0; display: none; -webkit-user-select: initial; }
214
215.montage-editor { padding: 0px; word-wrap: normal; }
216
215.panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; } 217.panelContainer { margin: 0px; padding: 0px 0px; position: relative; overflow: auto; }
216 218
217.panelDisclosureIcon { background-image: url("../images/panels/panelDisclosureIcon.png"); background-repeat: no-repeat; width: 16px; height: 16px; float: left; -webkit-transition-property: rotate; -webkit-transition-duration: 0.2s; -webkit-transition-timing-function: linear; padding-right: 2px; } 219.panelDisclosureIcon { background-image: url("../images/panels/panelDisclosureIcon.png"); background-repeat: no-repeat; width: 16px; height: 16px; float: left; -webkit-transition-property: rotate; -webkit-transition-duration: 0.2s; -webkit-transition-timing-function: linear; padding-right: 2px; }
@@ -236,7 +238,7 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
236 238
237#toolPropertiesPanel { height: 32px; margin: 0px; } 239#toolPropertiesPanel { height: 32px; margin: 0px; }
238 240
239#timelinePanel { height: 116px; } 241#timelinePanel { height: 100%; }
240 242
241.treeComponent { -webkit-user-select: none; font-size: 11px; margin-left: 20px; cursor: default; color: white; } 243.treeComponent { -webkit-user-select: none; font-size: 11px; margin-left: 20px; cursor: default; color: white; }
242 244
diff --git a/js/components/button.reel/button.js b/js/components/button.reel/button.js
index ce5ac1af..2d26c8b4 100755
--- a/js/components/button.reel/button.js
+++ b/js/components/button.reel/button.js
@@ -179,7 +179,7 @@ var Button = exports.Button = Montage.create(Component, {
179 value: function() { 179 value: function() {
180 if(this.isToggleButton) 180 if(this.isToggleButton)
181 { 181 {
182 if(this._value) 182 if(this._value === true)
183 { 183 {
184 this.element.classList.remove(this.offState); 184 this.element.classList.remove(this.offState);
185 this.element.classList.add(this.onState); 185 this.element.classList.add(this.onState);
diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js
new file mode 100644
index 00000000..1d0ad776
--- /dev/null
+++ b/js/components/editable.reel/editable.js
@@ -0,0 +1,250 @@
1/* ComputedStyleSubPanel.js */
2var Montage = require("montage").Montage,
3 Component = require("montage/ui/component").Component;
4
5
6/*
7
8EDITABLE - Methods
9- startEdit
10- stopEdit
11- value
12-
13- _suggest
14- _suggestNext