diff options
Diffstat (limited to 'js/panels')
21 files changed, 1180 insertions, 395 deletions
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.css b/js/panels/Materials/materials-popup.reel/materials-popup.css index 89233c64..2d339411 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.css +++ b/js/panels/Materials/materials-popup.reel/materials-popup.css | |||
@@ -37,21 +37,53 @@ | |||
37 | .mp_property | 37 | .mp_property |
38 | { | 38 | { |
39 | height:40px; | 39 | height:40px; |
40 | position: relative; | ||
40 | } | 41 | } |
41 | 42 | ||
42 | .mp_property > .prop-label | 43 | .mp_property > .prop-label |
43 | { | 44 | { |
44 | float: left; | 45 | position:relative; |
45 | /*width:86px;*/ | 46 | top:12px; |
46 | margin: 0px 8px 2px 5px; | 47 | float: left; |
48 | width: 100px; | ||
47 | } | 49 | } |
48 | 50 | ||
49 | .mp_property > .prop-controller | 51 | .mp_property > .prop-controller |
50 | { | 52 | { |
51 | float: right; | 53 | position:relative; |
52 | clear: left; | 54 | top:12px; |
53 | width: auto; | 55 | left: 10px; |
54 | margin: 0px 0px 3px 0px; | 56 | float: left; |
57 | } | ||
58 | |||
59 | .mp_property .hottext, | ||
60 | .mp_property .hottextInput | ||
61 | { | ||
62 | width: 30px; | ||
63 | } | ||
64 | |||
65 | .mp_property .button | ||
66 | { | ||
67 | width: 30px; | ||
68 | height: 20px; | ||
69 | } | ||
70 | |||
71 | .mp_property .inputRow | ||
72 | { | ||
73 | top: 8px; | ||
74 | position: relative; | ||
75 | } | ||
76 | |||
77 | .mp_properties_list | ||
78 | { | ||
79 | padding-bottom: 8px; | ||
80 | } | ||
81 | |||
82 | .mp_properties_list > .mp_property > .colortoolbar | ||
83 | { | ||
84 | width: 27px !important; | ||
85 | height: 27px !important; | ||
86 | overflow:hidden !important; | ||
55 | } | 87 | } |
56 | 88 | ||
57 | .mp_buttons { | 89 | .mp_buttons { |
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html index 34f68554..ae0ee2c8 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.html +++ b/js/panels/Materials/materials-popup.reel/materials-popup.html | |||
@@ -104,7 +104,7 @@ | |||
104 | 104 | ||
105 | <hr /> | 105 | <hr /> |
106 | 106 | ||
107 | <div id="mp_properties_list" class="mp_properties_list" style="-webkit-user-select: none;"> | 107 | <div id="mp_properties_list" class="mp_properties_list"> |
108 | <div id="mp_property" class="mp_property"></div> | 108 | <div id="mp_property" class="mp_property"></div> |
109 | </div> | 109 | </div> |
110 | 110 | ||
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js index b44761bc..bbccf45d 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.js +++ b/js/panels/Materials/materials-popup.reel/materials-popup.js | |||
@@ -237,7 +237,7 @@ exports.MaterialsPopup = Montage.create(Component, { | |||
237 | } | 237 | } |
238 | else | 238 | else |
239 | { | 239 | { |
240 | this.materialsData = this._dummyData1; | 240 | this.materialsData = this._dummyData1.slice(0); |
241 | } | 241 | } |
242 | 242 | ||
243 | this.needsDraw = true; | 243 | this.needsDraw = true; |
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js index ac45b4ba..98ebb36a 100755 --- a/js/panels/Splitter.js +++ b/js/panels/Splitter.js | |||
@@ -55,7 +55,7 @@ exports.Splitter = Montage.create(Component, { | |||
55 | }, | 55 | }, |
56 | set: function(value) { | 56 | set: function(value) { |
57 | this._collapsed = value; | 57 | this._collapsed = value; |
58 | this.needsDraw = true; | 58 | |
59 | this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": value}); | 59 | this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": value}); |
60 | } | 60 | } |
61 | }, | 61 | }, |
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index eb9ff3a9..9a9623b8 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html | |||
@@ -17,6 +17,7 @@ | |||
17 | "element": {"#": "layer"}, | 17 | "element": {"#": "layer"}, |
18 | "styleRepetition" : {"@":"repetition1"}, | 18 | "styleRepetition" : {"@":"repetition1"}, |
19 | "dynamicLayerName" : {"@":"dtext1"}, | 19 | "dynamicLayerName" : {"@":"dtext1"}, |
20 | "dynamicLayerTag" : {"@": "dtext2"}, | ||
20 | "slotStyle" : {"@":"slot1"}, | 21 | "slotStyle" : {"@":"slot1"}, |
21 | "mainCollapser" : {"@" : "mainCollapser"}, | 22 | "mainCollapser" : {"@" : "mainCollapser"}, |
22 | "positionCollapser" : {"@" : "positionCollapser"}, | 23 | "positionCollapser" : {"@" : "positionCollapser"}, |
@@ -41,6 +42,20 @@ | |||
41 | } | 42 | } |
42 | } | 43 | } |
43 | }, | 44 | }, |
45 | "dtext2" : { | ||
46 | "module" : "montage/ui/dynamic-text.reel", | ||
47 | "name" : "DynamicText", | ||
48 | "properties" : { | ||
49 | "element" : {"#" : "layer-tag"} | ||
50 | }, | ||
51 | "bindings" : { | ||
52 | "value" : { | ||
53 | "boundObject" : {"@": "owner"}, | ||
54 | "boundObjectPropertyPath" : "layerTag", | ||
55 | "oneway" : false | ||
56 | } | ||
57 | } | ||
58 | }, | ||
44 | "repetition1": { | 59 | "repetition1": { |
45 | "module": "montage/ui/repetition.reel", | 60 | "module": "montage/ui/repetition.reel", |
46 | "name": "Repetition", | 61 | "name": "Repetition", |
@@ -326,6 +341,7 @@ | |||
326 | 341 | ||
327 | <div data-montage-id="layer" class="container-layer"> | 342 | <div data-montage-id="layer" class="container-layer"> |
328 | <div class="label-layer" data-montage-id="myLabel"> | 343 | <div class="label-layer" data-montage-id="myLabel"> |
344 | <span data-montage-id="layer-tag" class="layer-tag"></span> | ||
329 | <span class="collapsible-label" data-montage-id="layer-label-text" spellcheck="false">Label</span> | 345 | <span class="collapsible-label" data-montage-id="layer-label-text" spellcheck="false">Label</span> |
330 | <span class="collapsible-clicker collapsible-collapsed" data-montage-id="clicker-main"></span> | 346 | <span class="collapsible-clicker collapsible-collapsed" data-montage-id="clicker-main"></span> |
331 | <div class="cssbutton button-lock"></div> | 347 | <div class="cssbutton button-lock"></div> |
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index 3bcc1401..f62d43a4 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js | |||
@@ -99,6 +99,20 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
99 | this.layerData.layerID = value; | 99 | this.layerData.layerID = value; |
100 | } | 100 | } |
101 | }, | 101 | }, |
102 | _layerTag:{ | ||
103 | value: "tag" | ||
104 | }, | ||
105 | |||
106 | layerTag:{ | ||
107 | serializable: true, | ||
108 | get:function(){ | ||
109 | return this._layerTag; | ||
110 | }, | ||
111 | set:function(newVal){ | ||
112 | this._layerTag = newVal; | ||
113 | this.layerData.layerTag = newVal; | ||
114 | } | ||
115 | }, | ||
102 | 116 | ||
103 | /* Position and Transform hottext values */ | 117 | /* Position and Transform hottext values */ |
104 | _dtextPositionX : { | 118 | _dtextPositionX : { |
@@ -290,9 +304,30 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
290 | }, | 304 | }, |
291 | set:function(value){ | 305 | set:function(value){ |
292 | this._isAnimated = value; | 306 | this._isAnimated = value; |
293 | this.layerData.isAnimated = newVal; |