aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
authorJon Reid2012-07-17 15:58:41 -0700
committerJon Reid2012-07-17 15:58:41 -0700
commita12cabc16273ffe04af4bce1f7438dc9326efa89 (patch)
treed8d81af679fa2d3a831b00882c69ba376996b578 /js/panels
parent4a87ff575693509ac578d46af26fa137c0dc3f58 (diff)
downloadninja-a12cabc16273ffe04af4bce1f7438dc9326efa89.tar.gz
Timeline: Possible fix for new file/new style crash problem.
Diffstat (limited to 'js/panels')
-rw-r--r--js/panels/Timeline/Style.reel/Style.js26
-rw-r--r--js/panels/Timeline/Style.reel/css/Style.css124
-rw-r--r--js/panels/Timeline/Style.reel/scss/Style.scss2
3 files changed, 57 insertions, 95 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js
index 930e1281..1d72199a 100644
--- a/js/panels/Timeline/Style.reel/Style.js
+++ b/js/panels/Timeline/Style.reel/Style.js
@@ -438,12 +438,12 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
438 _showView : { 438 _showView : {
439 value: function() { 439 value: function() {
440 if (this.whichView === "hintable") { 440 if (this.whichView === "hintable") {
441 this.containerHintable.classList.remove("hidden"); 441 this.containerHintable.classList.remove("hideme");
442 this.containerPropvals.classList.add("hidden"); 442 this.containerPropvals.classList.add("hideme");
443 this.myHintable.start(); 443 this.myHintable.start();
444 } else { 444 } else {
445 this.containerHintable.classList.add("hidden"); 445 this.containerHintable.classList.add("hideme");
446 this.containerPropvals.classList.remove("hidden"); 446 this.containerPropvals.classList.remove("hideme");
447 this._showTweener(); 447 this._showTweener();
448 } 448 }
449 } 449 }
@@ -466,9 +466,9 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
466 } 466 }
467 467
468 if (tweenable.tweener === "hottext" ) { 468 if (tweenable.tweener === "hottext" ) {
469 this.editorInputContainer.classList.add("hidden"); 469 this.editorInputContainer.classList.add("hideme");
470 this.editorColorContainer.classList.add("hidden"); 470 this.editorColorContainer.classList.add("hideme");
471 this.editorHottextContainer.classList.remove("hidden"); 471 this.editorHottextContainer.classList.remove("hideme");
472 this.valueEditorHottext.acceptableUnits = [tweenable.units]; 472 this.valueEditorHottext.acceptableUnits = [tweenable.units];
473 this.valueEditorHottext.units = tweenable.units; 473 this.valueEditorHottext.units = tweenable.units;
474 this.valueEditorHottext.minValue = tweenable.min; 474 this.valueEditorHottext.minValue = tweenable.min;
@@ -481,9 +481,9 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
481 this.valueEditorHottext.addEventListener("changing",this,false); 481 this.valueEditorHottext.addEventListener("changing",this,false);
482 this.valueEditorHottext.needsDraw = true; 482 this.valueEditorHottext.needsDraw = true;
483 } else if (tweenable.tweener === "color" ) { 483 } else if (tweenable.tweener === "color" ) {
484 this.editorInputContainer.classList.add("hidden"); 484 this.editorInputContainer.classList.add("hideme");
485 this.editorColorContainer.classList.remove("hidden"); 485 this.editorColorContainer.classList.remove("hideme");
486 this.editorHottextContainer.classList.add("hidden"); 486 this.editorHottextContainer.classList.add("hideme");
487 487
488 if(tweenable.colorType === "fill"){ 488 if(tweenable.colorType === "fill"){
489 this._isFill = true; 489 this._isFill = true;
@@ -508,9 +508,9 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
508 } 508 }
509 // TODO: set up color chip here. 509 // TODO: set up color chip here.
510 } else if (tweenable.tweener === "input"){ 510 } else if (tweenable.tweener === "input"){
511 this.editorInputContainer.classList.remove("hidden"); 511 this.editorInputContainer.classList.remove("hideme");
512 this.editorColorContainer.classList.add("hidden"); 512 this.editorColorContainer.classList.add("hideme");
513 this.editorHottextContainer.classList.add("hidden"); 513 this.editorHottextContainer.classList.add("hideme");
514 this.valueEditorInput.value = this.editorValue; 514 this.valueEditorInput.value = this.editorValue;
515 this.valueEditorInput.addEventListener("blur",this,false); 515 this.valueEditorInput.addEventListener("blur",this,false);
516 } else { 516 } else {
diff --git a/js/panels/Timeline/Style.reel/css/Style.css b/js/panels/Timeline/Style.reel/css/Style.css
index 4819d4f5..c0130988 100644
--- a/js/panels/Timeline/Style.reel/css/Style.css
+++ b/js/panels/Timeline/Style.reel/css/Style.css
@@ -1,3 +1,4 @@
1@charset "UTF-8";
1/* <copyright> 2/* <copyright>
2Copyright (c) 2012, Motorola Mobility LLC. 3Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved. 4All Rights Reserved.
@@ -5,16 +6,11 @@ All Rights Reserved.
5Redistribution and use in source and binary forms, with or without 6Redistribution and use in source and binary forms, with or without
6modification, are permitted provided that the following conditions are met: 7modification, are permitted provided that the following conditions are met:
7 8
8* Redistributions of source code must retain the above copyright notice, 9* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
9 this list of conditions and the following disclaimer.
10 10
11* Redistributions in binary form must reproduce the above copyright notice, 11* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
12 this list of conditions and the following disclaimer in the documentation
13 and/or other materials provided with the distribution.
14 12
15* Neither the name of Motorola Mobility LLC nor the names of its 13* Neither the name of Motorola Mobility LLC nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
16 contributors may be used to endorse or promote products derived from this
17 software without specific prior written permission.
18 14
19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 15THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 16AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -28,76 +24,42 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 24ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE. 25POSSIBILITY OF SUCH DAMAGE.
30</copyright> */ 26</copyright> */
31/* Layer.scss 27/* Layer.scss Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. */
32 * Main SCSS file for Layer component, compiled by SASS into the file css/Layer.css. 28/* line 43, ../scss/Style.scss */
33 */ 29.hideme { display: none; }
34.hidden { 30
35 display: none; } 31/* line 46, ../scss/Style.scss */
36 32.row-editor { position: relative; height: 14px; }
37.row-editor { 33
38 position: relative; 34/* line 50, ../scss/Style.scss */
39 height: 14px; } 35.style-padding { padding-left: 5px; padding-top: 3px; padding-right: 5px; }
40 36
41.style-padding { 37/* line 55, ../scss/Style.scss */
42 padding-left: 5px; 38.style-row { height: 20px; border-bottom: 1px solid #505050; }
43 padding-top: 3px; 39
44 padding-right: 5px; } 40/* line 60, ../scss/Style.scss */
45 41div.content-style div.editable2 { height: 14px; background-color: #242424 !important; color: #b2b2b2 !important; border-width: 0px; font-size: 11px; overflow: hidden; -webkit-user-select: text; white-space: nowrap; text-overflow: clip; width: 100%; }
46.style-row { 42
47 height: 20px; 43/* line 74, ../scss/Style.scss */
48 border-bottom: 1px solid #505050; } 44.content-style.collapsible-content, .content-style.collapsible-content div, .content-style.collapsible-content span { overflow: visible; text-overflow: visible; }
49 45
50div.content-style div.editable2 { 46/* line 79, ../scss/Style.scss */
51 height: 14px; 47div.content-style div.cell-property, div.content-style div.cell-value { width: 45%; float: left; height: 18px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; line-height: 18px; }
52 background-color: #242424 !important; 48
53 color: #b2b2b2 !important; 49/* line 88, ../scss/Style.scss */
54 border-width: 0px; 50div.content-style div.cell-property div { min-width: 90%; height: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
55 font-size: 11px; 51
56 overflow: hidden; 52/* line 96, ../scss/Style.scss */
57 -webkit-user-select: text; 53div.content-style input.nj-skinned { height: 10px; font-size: 12px; top: -3px; }
58 white-space: nowrap; 54
59 text-overflow: clip; 55/* line 101, ../scss/Style.scss */
60 width: 100%; } 56div.style-row .container-propvals { overflow: hidden; }
61 57
62.content-style.collapsible-content, 58/* line 105, ../scss/Style.scss */
63.content-style.collapsible-content div, 59.content-style .style-row.selected { background-color: #474747; color: white; }
64.content-style.collapsible-content span { 60
65 overflow: visible; 61/* line 109, ../scss/Style.scss */
66 text-overflow: visible; } 62.content-style .style-row.style-selected { background-color: #b2b2b2; color: #242424; }
67 63
68div.content-style div.cell-property, 64/* line 114, ../scss/Style.scss */
69div.content-style div.cell-value { 65.toolColorChipCtrl.color-chip-position { margin-top: 0px; height: 14px; }
70 width: 45%;
71 float: left;
72 height: 18px;
73 overflow: hidden;
74 text-overflow: ellipsis;
75 white-space: nowrap;
76 line-height: 18px; }
77
78div.content-style div.cell-property div {
79 min-width: 90%;
80 height: 100%;
81 overflow: hidden;
82 text-overflow: ellipsis;
83 white-space: nowrap; }
84
85div.content-style input.nj-skinned {
86 height: 10px;
87 font-size: 12px;
88 top: -3px; }
89
90div.style-row .container-propvals {
91 overflow: hidden; }
92
93.content-style .style-row.selected {
94 background-color: #474747;
95 color: white; }
96
97.content-style .style-row.style-selected {
98 background-color: #b2b2b2;
99 color: #242424; }
100
101.toolColorChipCtrl.color-chip-position {
102 margin-top: 0px;
103 height: 14px; }
diff --git a/js/panels/Timeline/Style.reel/scss/Style.scss b/js/panels/Timeline/Style.reel/scss/Style.scss
index 2d1947b0..ad527ad5 100644
--- a/js/panels/Timeline/Style.reel/scss/Style.scss
+++ b/js/panels/Timeline/Style.reel/scss/Style.scss
@@ -40,7 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
40// Import generic mixins and styles 40// Import generic mixins and styles
41@import "../../../../../scss/imports/scss/mixins"; 41@import "../../../../../scss/imports/scss/mixins";
42 42
43.hidden { 43.hideme {
44 display: none; 44 display: none;
45}