aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xjs/controllers/document-controller.js6
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html153
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js134
-rw-r--r--js/panels/Timeline/Layer.reel/css/Layer.css29
-rw-r--r--js/panels/Timeline/Layer.reel/scss/Layer.scss6
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html35
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js13
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js4
-rwxr-xr-xjs/stage/stage-view.reel/stage-view.js2
9 files changed, 343 insertions, 39 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 1c9d9d59..843db87c 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -169,6 +169,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
169 value:function(doc){ 169 value:function(doc){
170 var response = doc || null;//default just for testing 170 var response = doc || null;//default just for testing
171 if(!!response && response.success && (response.status!== 500) && !!response.uri){ 171 if(!!response && response.success && (response.status!== 500) && !!response.uri){
172 this.creatingNewFile = true;//flag for timeline to identify new file flow
172 this.application.ninja.ioMediator.fileOpen(response.uri, this.openFileCallback.bind(this)); 173 this.application.ninja.ioMediator.fileOpen(response.uri, this.openFileCallback.bind(this));
173 }else if(!!response && !response.success){ 174 }else if(!!response && !response.success){
174 //Todo: restrict directory path to the sandbox, in the dialog itself 175 //Todo: restrict directory path to the sandbox, in the dialog itself
@@ -196,6 +197,11 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
196 value:function(response){ 197 value:function(response){
197 //TODO: Add UI to handle error codes, shouldn't be alert windows 198 //TODO: Add UI to handle error codes, shouldn't be alert windows
198 if(!!response && (response.status === 204)) { 199 if(!!response && (response.status === 204)) {
200
201 if((typeof this.creatingNewFile === 'undefined') || (this.creatingNewFile !== true)){//not from new file flow
202 this.creatingNewFile = false;
203 }
204
199 //Sending full response object 205 //Sending full response object
200 this.openDocument(response); 206 this.openDocument(response);
201 } else if (!!response && (response.status === 404)){ 207 } else if (!!response && (response.status === 404)){
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index a3fbd5b1..d30ef0e3 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -92,7 +92,140 @@
92 "oneway" : false 92 "oneway" : false
93 } 93 }
94 } 94 }
95 } 95 },
96 "dtext-position-x" : {
97 "module": "js/components/hottextunit.reel",
98 "name": "HotTextUnit",
99 "properties": {
100 "element": {"#": "position-x"},
101 "maxValue" : 100000,
102 "minValue" : -100000,
103 "acceptableUnits" : "px",
104 "units" : "px",
105 "value" : 0
106 },
107 "bindings": {
108 "value": {
109 "boundObject": {"@": "owner"},
110 "boundObjectPropertyPath": "dtextPositionX",
111 "oneway": false
112 }
113 }
114 },
115 "dtext-position-y" : {
116 "module": "js/components/hottextunit.reel",
117 "name": "HotTextUnit",
118 "properties": {
119 "element": {"#": "position-y"},
120 "maxValue" : 100000,
121 "minValue" : -100000,
122 "acceptableUnits" : "px",
123 "units" : "px",
124 "value" : 0
125 },
126 "bindings": {
127 "value": {
128 "boundObject": {"@": "owner"},
129 "boundObjectPropertyPath": "dtextPositionY",
130 "oneway": false
131 }
132 }
133 },
134 "dtext-scale-x" : {
135 "module": "js/components/hottextunit.reel",
136 "name": "HotTextUnit",
137 "properties": {
138 "element": {"#": "scale-x"},
139 "maxValue" : 100,
140 "minValue" : 0,
141 "acceptableUnits" : "%",
142 "units" : "%",
143 "value" : 0
144 },
145 "bindings": {
146 "value": {
147 "boundObject": {"@": "owner"},
148 "boundObjectPropertyPath": "dtextScaleX",
149 "oneway": false
150 }
151 }
152 },
153 "dtext-scale-y" : {
154 "module": "js/components/hottextunit.reel",
155 "name": "HotTextUnit",
156 "properties": {
157 "element": {"#": "scale-y"},
158 "maxValue" : 100,
159 "minValue" : 0,
160 "acceptableUnits" : "%",
161 "units" : "%",
162 "value" : 0
163 },
164 "bindings": {
165 "value": {
166 "boundObject": {"@": "owner"},
167 "boundObjectPropertyPath": "dtextScaleY",
168 "oneway": false
169 }
170 }
171 },
172 "dtext-skew-x" : {
173 "module": "js/components/hottextunit.reel",
174 "name": "HotTextUnit",
175 "properties": {
176 "element": {"#": "skew-x"},
177 "maxValue" : 100,
178 "minValue" : 0,
179 "acceptableUnits" : "%",
180 "units" : "%",
181 "value" : 0
182 },
183 "bindings": {
184 "value": {
185 "boundObject": {"@": "owner"},
186 "boundObjectPropertyPath": "dtextSkewX",
187 "oneway": false
188 }
189 }
190 },
191 "dtext-skew-y" : {
192 "module": "js/components/hottextunit.reel",
193 "name": "HotTextUnit",
194 "properties": {
195 "element": {"#": "skew-y"},
196 "maxValue" : 100,
197 "minValue" : 0,
198 "acceptableUnits" : "%",
199 "units" : "%",
200 "value" : 0
201 },
202 "bindings": {
203 "value": {
204 "boundObject": {"@": "owner"},
205 "boundObjectPropertyPath": "dtextSkewY",
206 "oneway": false
207 }
208 }
209 },
210 "dtext-rotate" : {
211 "module": "js/components/hottextunit.reel",
212 "name": "HotTextUnit",
213 "properties": {
214 "element": {"#": "rotation"},
215 "maxValue" : 360,
216 "minValue" : -360,
217 "acceptableUnits" : "degrees",
218 "units" : "degrees",
219 "value" : 0
220 },
221 "bindings": {
222 "value": {
223 "boundObject": {"@": "owner"},
224 "boundObjectPropertyPath": "dtextRotate",
225 "oneway": false
226 }
227 }
228 }
96 } 229 }
97 </script> 230 </script>
98 </head> 231 </head>
@@ -114,15 +247,11 @@
114 <div class="layout-table"> 247 <div class="layout-table">
115 <div class="layout-row"> 248 <div class="layout-row">
116 <div class="layout-cell">X</div> 249 <div class="layout-cell">X</div>
117 <div class="layout-cell">100px</div> 250 <div class="layout-cell"><div id="position-x"></div></div>
118 </div> 251 </div>
119 <div class="layout-row"> 252 <div class="layout-row">
120 <div class="layout-cell">Y</div> 253 <div class="layout-cell">Y</div>
121 <div class="layout-cell">100px</div> 254 <div class="layout-cell"><div id="position-y"></div></div>
122 </div>
123 <div class="layout-row">
124 <div class="layout-cell">Z</div>
125 <div class="layout-cell">100px</div>
126 </div> 255 </div>
127 </div> 256 </div>
128 </div> 257 </div>
@@ -134,23 +263,23 @@
134 <div class="layout-table"> 263 <div class="layout-table">
135 <div class="layout-row"> 264 <div class="layout-row">