aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-12 15:26:10 -0700
committerPushkar Joshi2012-03-12 15:26:10 -0700
commit46b2e561fa6ca054cad58e4c372a598bbb7ee2c9 (patch)
tree38d1c8666098a10078834c1eaac3d455135bee12
parent7b4b068cadc0af8ec7e930e1c2b429e945f96984 (diff)
parent69d90467865a1384725b2301901be2180c5a841f (diff)
downloadninja-46b2e561fa6ca054cad58e4c372a598bbb7ee2c9.tar.gz
Merge branch 'master' into brushtool
-rwxr-xr-xcss/ninja.css2
-rwxr-xr-xjs/components/gradientpicker.reel/gradientpicker.js2
-rwxr-xr-xjs/controllers/color-controller.js4
-rwxr-xr-xjs/controllers/document-controller.js9
-rwxr-xr-xjs/document/html-document.js97
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js10
-rw-r--r--js/mediators/io-mediator.js8
-rwxr-xr-xjs/panels/Color/colorpanelpopup.reel/colorpanelpopup.js13
-rwxr-xr-xjs/panels/Panel.reel/Panel.html20
-rwxr-xr-xjs/panels/Panel.reel/Panel.js4
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.js77
-rw-r--r--js/panels/Timeline/Collapser.js70
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.html129
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js190
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html14
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js560
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html136
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js138
-rw-r--r--js/panels/Timeline/Tween.reel/Tween.js10
-rwxr-xr-xnode_modules/montage/bin/montage3
-rwxr-xr-xnode_modules/montage/core/core.js20
-rwxr-xr-xnode_modules/montage/core/deserializer.js115
-rwxr-xr-xnode_modules/montage/core/serializer.js45
-rwxr-xr-xnode_modules/montage/montage.js68
-rw-r--r--node_modules/montage/node.js140
-rwxr-xr-xnode_modules/montage/package.json33
-rwxr-xr-xnode_modules/montage/require/browser.js90
-rw-r--r--node_modules/montage/require/node.js49
-rwxr-xr-xnode_modules/montage/require/require.js205
-rwxr-xr-xnode_modules/montage/ui/application.js4
-rw-r--r--node_modules/montage/ui/bluemoon/progress.reel/progress.js20
-rw-r--r--node_modules/montage/ui/check-input.js2
-rw-r--r--node_modules/montage/ui/checkbox.reel/checkbox.js2
-rwxr-xr-xnode_modules/montage/ui/component.js115
-rw-r--r--node_modules/montage/ui/composer/press-composer.js9
-rw-r--r--node_modules/montage/ui/composer/translate-composer.js77
-rwxr-xr-xnode_modules/montage/ui/condition.reel/condition.js24
-rwxr-xr-xnode_modules/montage/ui/controller/array-controller.js8
-rwxr-xr-xnode_modules/montage/ui/list.reel/list.html10
-rwxr-xr-xnode_modules/montage/ui/loader.reel/loader.js6
-rwxr-xr-xnode_modules/montage/ui/loading-panel.reel/loading-panel.css38
-rwxr-xr-xnode_modules/montage/ui/loading-panel.reel/loading-panel.html6
-rw-r--r--node_modules/montage/ui/native-control.js3
-rwxr-xr-xnode_modules/montage/ui/popup/confirm.reel/confirm.js4
-rwxr-xr-xnode_modules/montage/ui/popup/popup.reel/popup.js159
-rwxr-xr-xnode_modules/montage/ui/progress.reel/progress.css51
-rwxr-xr-xnode_modules/montage/ui/progress.reel/progress.html32
-rwxr-xr-xnode_modules/montage/ui/progress.reel/progress.js144
-rwxr-xr-xnode_modules/montage/ui/progress.reel/rule.pngbin956 -> 0 bytes
-rwxr-xr-xnode_modules/montage/ui/progress.reel/scroll.pngbin272 -> 0 bytes
-rwxr-xr-xnode_modules/montage/ui/radio-button.reel/radio-button.js3
-rwxr-xr-xnode_modules/montage/ui/repetition.reel/repetition.js127
-rwxr-xr-xnode_modules/montage/ui/scroll.js820
-rw-r--r--node_modules/montage/ui/scroller.reel/scroller.html1
-rw-r--r--node_modules/montage/ui/scroller.reel/scroller.js36
-rw-r--r--node_modules/montage/ui/select-input.reel/select-input.js115
-rw-r--r--node_modules/montage/ui/skeleton/range-input.reel/range-input.css27
-rw-r--r--node_modules/montage/ui/skeleton/range-input.reel/range-input.html62
-rw-r--r--node_modules/montage/ui/skeleton/range-input.reel/range-input.js234
-rwxr-xr-xnode_modules/montage/ui/slot.reel/slot.js19
-rwxr-xr-xnode_modules/montage/ui/template.js4
-rw-r--r--node_modules/montage/ui/text-input.js16
-rw-r--r--node_modules/montage/ui/textarea.reel/textarea.js2
-rw-r--r--node_modules/montage/ui/toggle-button.reel/toggle-button.js9
-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/_PanelUI.scss14
68 files changed, 2880 insertions, 2186 deletions
diff --git a/css/ninja.css b/css/ninja.css
index f139c3b9..8213ec26 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -655,6 +655,8 @@ body section .dragging { opacity: 0.4; }
655 655
656body .main .dragOver:not(.dragging) { background-color: #917B56; } 656body .main .dragOver:not(.dragging) { background-color: #917B56; }
657 657
658.panelDisabled { position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 6000; color: white; text-align: center; line-height: 100px; box-shadow: inset 0 0 14px #111111; background: rgba(30, 30, 30, 0.8); }
659
658.menuBar { width: 100%; border-style: solid; border-width: 1px; height: 22px; color: white; background: #474747; border-color: black; } 660.menuBar { width: 100%; border-style: solid; border-width: 1px; height: 22px; color: white; background: #474747; border-color: black; }
659 661
660.menuBar ul { list-style: none; margin: 0; padding: 0; float: left; cursor: default; } 662.menuBar ul { list-style: none; margin: 0; padding: 0; float: left; cursor: default; }
diff --git a/js/components/gradientpicker.reel/gradientpicker.js b/js/components/gradientpicker.reel/gradientpicker.js
index 0940be3c..da4e8c0f 100755
--- a/js/components/gradientpicker.reel/gradientpicker.js
+++ b/js/components/gradientpicker.reel/gradientpicker.js
@@ -397,7 +397,7 @@ exports.GradientPicker = Montage.create(Component, {
397 actionEvent.initEvent(type, true, true); 397 actionEvent.initEvent(type, true, true);
398 actionEvent.type = type; 398 actionEvent.type = type;
399 actionEvent.wasSetByCode = userInitiated; 399 actionEvent.wasSetByCode = userInitiated;
400 actionEvent.gradient = {stops: this.value, mode: this.mode, css: css}; 400 actionEvent.gradient = {stops: this.value, mode: this.mode, gradientMode: this.mode, css: css};
401 this.dispatchEvent(actionEvent); 401 this.dispatchEvent(actionEvent);
402 } 402 }
403 } 403 }
diff --git a/js/controllers/color-controller.js b/js/controllers/color-controller.js
index a6e41dd3..53573baf 100755
--- a/js/controllers/color-controller.js
+++ b/js/controllers/color-controller.js
@@ -259,6 +259,7 @@ exports.ColorController = Montage.create(Component, {
259 //Radial gradient 259 //Radial gradient
260 gradient.stops = []; 260 gradient.stops = [];
261 gradient.mode = 'radial'; 261 gradient.mode = 'radial';
262 gradient.gradientMode = 'radial';
262 gradient.css = css; 263 gradient.css = css;
263 // 264 //
264 arr = css.split('%,'); 265 arr = css.split('%,');
@@ -284,6 +285,7 @@ exports.ColorController = Montage.create(Component, {
284 //Linear gradient 285 //Linear gradient
285 gradient.stops = []; 286 gradient.stops = [];
286 gradient.mode = 'linear'; 287 gradient.mode = 'linear';
288 gradient.gradientMode = 'linear';
287 gradient.css = css; 289 gradient.css = css;
288 // 290 //
289 arr = css.split('from('); 291 arr = css.split('from(');
@@ -317,7 +319,7 @@ exports.ColorController = Montage.create(Component, {
317 } 319 }
318 } 320 }
319 //Creating gradient object 321 //Creating gradient object
320 color = {mode: 'gradient', value: {stops: gradient.stops, mode: gradient.mode, css: css}}; 322 color = {mode: 'gradient', value: {stops: gradient.stops, mode: gradient.mode, gradientMode: gradient.gradientMode, css: css}};
321 } else if (css){ 323 } else if (css){
322 //Simple solid color 324 //Simple solid color
323 color = this.parseCssToColor(css); 325 color = this.parseCssToColor(css);
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 194496a6..a8056519 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -336,14 +336,23 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
336 nextDocumentIndex = closeDocumentIndex - 1; 336 nextDocumentIndex = closeDocumentIndex - 1;
337 } 337 }
338 this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]); 338 this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]);
339 if(typeof this.activeDocument.stopVideos !== "undefined"){doc.stopVideos();}
339 this._removeDocumentView(doc.container); 340 this._removeDocumentView(doc.container);
340 }else if(this._documents.length === 0){ 341 }else if(this._documents.length === 0){
342 if(typeof this.activeDocument.pauseAndStopVideos !== "undefined"){
343 this.activeDocument.pauseAndStopVideos();
344 }
341 this.activeDocument = null; 345 this.activeDocument = null;
342 this._removeDocumentView(doc.container); 346 this._removeDocumentView(doc.container);
343 this.application.ninja.stage.stageView.hideRulers(); 347 this.application.ninja.stage.stageView.hideRulers();
344 document.getElementById("iframeContainer").style.display="block"; 348 document.getElementById("iframeContainer").style.display="block";
345 349
346 this.application.ninja.stage.hideCanvas(true); 350 this.application.ninja.stage.hideCanvas(true);
351 }else{//closing inactive document tab - just clear DOM
352 if(typeof doc.pauseAndStopVideos !== "undefined"){
353 doc.pauseAndStopVideos();
354 }
355 this._removeDocumentView(doc.container);
347 } 356 }
348 357
349 NJevent("closeDocument", doc.uri); 358 NJevent("closeDocument", doc.uri);
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 80930af2..23b55e92 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -437,8 +437,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
437 } else if (prop.indexOf('url') !== -1) { //From CSS property 437 } else if (prop.indexOf('url') !== -1) { //From CSS property
438 //TODO: Add functionality 438 //TODO: Add functionality
439 var docRootUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1]).replace(/\/\//gi, '/')); 439 var docRootUrl = this.application.ninja.coreIoApi.rootUrl+escape((this.