From b9afa81d391f51ea199fc12278b89bdda883dd97 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 17 Jul 2012 23:34:57 -0700 Subject: removed left over comments. Signed-off-by: Valerio Virgillito --- js/models/app-model.js | 156 ------------------------------------------------- 1 file changed, 156 deletions(-) (limited to 'js/models') diff --git a/js/models/app-model.js b/js/models/app-model.js index 1fc1ba12..52e298a5 100755 --- a/js/models/app-model.js +++ b/js/models/app-model.js @@ -34,32 +34,6 @@ var Montage = require("montage/core/core").Montage, exports.AppModel = Montage.create(Component, { - _currentDocument: { - value : null - }, - - currentDocument : { - get : function() { - return this._currentDocument; - }, - set : function(value) { - if (value === this._currentDocument) { - return; - } - - if(this._currentDocument && this._currentDocument.currentView === "design") { - this._currentDocument.model.draw3DGrid = this.show3dGrid; - } - - this._currentDocument = value; - - if(this._currentDocument && this._currentDocument.currentView === "design") { - this.show3dGrid = this._currentDocument.model.draw3DGrid; - } - - } - }, - _livePreview: { value: false }, @@ -72,18 +46,6 @@ exports.AppModel = Montage.create(Component, { this._livePreview = value; } }, - _chromePreview: { - value: false - }, - - chromePreview: { - get: function() { - return this._chromePreview; - }, - set: function(value) { - this._chromePreview = value; - } - }, _layoutView: { value: "layoutAll" @@ -98,67 +60,6 @@ exports.AppModel = Montage.create(Component, { } }, - _layoutAll: { - value: true - }, - - layoutAll: { - get: function() { - return this._layoutAll; - }, - set: function(value) { - - if(value) { - this.layoutView = "layoutAll"; - this.layoutItems = false; - this.layoutOff = false; - } - - this._layoutAll = value; - - } - }, - - _layoutItems: { - value: false - }, - - layoutItems: { - get: function() { - return this._layoutItems; - }, - set: function(value) { - - if(value) { - this.layoutView = "layoutItems"; - this.layoutAll = false; - this.layoutOff = false; - } - - this._layoutItems = value; - } - }, - - _layoutOff: { - value: false - }, - - layoutOff: { - get: function() { - return this._layoutOff; - }, - set: function(value) { - - if(value) { - this.layoutView = "layoutOff"; - this.layoutAll = false; - this.layoutItems = false; - } - - this._layoutOff = value; - } - }, - _snap: { value: true }, @@ -237,63 +138,6 @@ exports.AppModel = Montage.create(Component, { } }, - _frontStageView: { - value: true - }, - - frontStageView: { - get: function() { - return this._frontStageView; - }, - set: function(value) { - if(value) { - this.documentStageView = "front"; - this.topStageView = false; - this.sideStageView = false; - } - - this._frontStageView = value; - } - }, - - _topStageView: { - value: false - }, - - topStageView: { - get: function() { - return this._topStageView; - }, - set: function(value) { - if(value) { - this.documentStageView = "top"; - this.frontStageView = false; - this.sideStageView = false; - } - - this._topStageView = value; - } - }, - - _sideStageView: { - value: false - }, - - sideStageView: { - get: function() { - return this._sideStageView; - }, - set: function(value) { - if(value) { - this.documentStageView = "side"; - this.frontStageView = false; - this.topStageView = false; - } - - this._sideStageView = value; - } - }, - _debug: { value: true }, -- cgit v1.2.3 From 0df5ad6391df5d285cb8b93dc23e2595cddaec3c Mon Sep 17 00:00:00 2001 From: hwc487 Date: Thu, 19 Jul 2012 10:36:31 -0700 Subject: Re-added Radial Blur and Raiders materials --- js/models/materials-model.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'js/models') diff --git a/js/models/materials-model.js b/js/models/materials-model.js index cc3c3fa1..15feca93 100755 --- a/js/models/materials-model.js +++ b/js/models/materials-model.js @@ -42,8 +42,8 @@ var RadialGradientMaterial = require("js/lib/rdge/materials/radial-gradient-mate var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").BumpMetalMaterial; var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial; //var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial; -//var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial; -//var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial; +var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial; +var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial; var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial; var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial; //var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial; @@ -86,9 +86,9 @@ exports.MaterialsModel = Montage.create(Component, { this.addMaterial(new ParisMaterial()); this.addMaterial(new PlasmaMaterial()); this.addMaterial(new PulseMaterial()); - //this.addMaterial(new RadialBlurMaterial()); + this.addMaterial(new RadialBlurMaterial()); this.addMaterial(new RadialGradientMaterial()); - //this.addMaterial(new RaidersMaterial()); + this.addMaterial(new RaidersMaterial()); //this.addMaterial(new ReliefTunnelMaterial()); //this.addMaterial(new SquareTunnelMaterial()); //this.addMaterial(new StarMaterial()); @@ -251,7 +251,7 @@ exports.MaterialsModel = Montage.create(Component, { case "taper": mat = new TaperMaterial(); break; case "twistVert": mat = new TwistVertMaterial(); break; - //case "radialBlur": mat = new RadialBlurMaterial(); break; + case "radialBlur": mat = new RadialBlurMaterial(); break; case "plasma": mat = new PlasmaMaterial(); break; case "pulse": mat = new PulseMaterial(); break; //case "tunnel": mat = new TunnelMaterial(); break; @@ -261,7 +261,7 @@ exports.MaterialsModel = Montage.create(Component, { //case "fly": mat = new FlyMaterial(); break; case "water": mat = new WaterMaterial(); break; case "paris": mat = new ParisMaterial(); break; - //case "raiders": mat = new RaidersMaterial(); break; + case "raiders": mat = new RaidersMaterial(); break; //case "zinvert": mat = new ZInvertMaterial(); break; //case "deform": mat = new DeformMaterial(); break; //case "star": mat = new StarMaterial(); break; -- cgit v1.2.3 From 431b6fa7610e59074b4ebb3e9e712672f185b8ad Mon Sep 17 00:00:00 2001 From: hwc487 Date: Thu, 19 Jul 2012 11:44:50 -0700 Subject: Renamed Raiders material to Dark Blur, and Paris to Blue Sky. --- js/models/materials-model.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'js/models') diff --git a/js/models/materials-model.js b/js/models/materials-model.js index 15feca93..ec481933 100755 --- a/js/models/materials-model.js +++ b/js/models/materials-model.js @@ -43,7 +43,7 @@ var BumpMetalMaterial = require("js/lib/rdge/materials/bump-metal-material").Bum var UberMaterial = require("js/lib/rdge/materials/uber-material").UberMaterial; //var CloudMaterial = require("js/lib/rdge/materials/cloud-material").CloudMaterial; var RadialBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").RadialBlurMaterial; -var RaidersMaterial = require("js/lib/rdge/materials/radial-blur-material").RaidersMaterial; +var DarkBlurMaterial = require("js/lib/rdge/materials/radial-blur-material").DarkBlurMaterial; var PlasmaMaterial = require("js/lib/rdge/materials/plasma-material").PlasmaMaterial; var PulseMaterial = require("js/lib/rdge/materials/pulse-material").PulseMaterial; //var TunnelMaterial = require("js/lib/rdge/materials/tunnel-material").TunnelMaterial; @@ -52,7 +52,7 @@ var FlagMaterial = require("js/lib/rdge/materials/flag-material").FlagMaterial; //var SquareTunnelMaterial = require("js/lib/rdge/materials/square-tunnel-material").SquareTunnelMaterial; //var FlyMaterial = require("js/lib/rdge/materials/fly-material").FlyMaterial; var WaterMaterial = require("js/lib/rdge/materials/water-material").WaterMaterial; -var ParisMaterial = require("js/lib/rdge/materials/water-material").ParisMaterial; +var BlueSkyMaterial = require("js/lib/rdge/materials/water-material").BlueSkyMaterial; //var ZInvertMaterial = require("js/lib/rdge/materials/z-invert-material").ZInvertMaterial; //var DeformMaterial = require("js/lib/rdge/materials/deform-material").DeformMaterial; //var StarMaterial = require("js/lib/rdge/materials/star-material").StarMaterial; @@ -74,8 +74,10 @@ exports.MaterialsModel = Montage.create(Component, { value: function() { // Load all the materials this.addMaterial(new FlatMaterial()); + this.addMaterial(new BlueSkyMaterial()); this.addMaterial(new BumpMetalMaterial()); //this.addMaterial(new CloudMaterial()); + this.addMaterial(new DarkBlurMaterial()); //this.addMaterial(new DeformMaterial()); this.addMaterial(new FlagMaterial()); //this.addMaterial(new FlyMaterial()); @@ -83,12 +85,10 @@ exports.MaterialsModel = Montage.create(Component, { //this.addMaterial(new KeleidoscopeMaterial()); this.addMaterial(new LinearGradientMaterial()); //this.addMaterial(new MandelMaterial()); - this.addMaterial(new ParisMaterial()); this.addMaterial(new PlasmaMaterial()); this.addMaterial(new PulseMaterial()); this.addMaterial(new RadialBlurMaterial()); this.addMaterial(new RadialGradientMaterial()); - this.addMaterial(new RaidersMaterial()); //this.addMaterial(new ReliefTunnelMaterial()); //this.addMaterial(new SquareTunnelMaterial()); //this.addMaterial(new StarMaterial()); @@ -260,8 +260,8 @@ exports.MaterialsModel = Montage.create(Component, { case "flag": mat = new FlagMaterial(); break; //case "fly": mat = new FlyMaterial(); break; case "water": mat = new WaterMaterial(); break; - case "paris": mat = new ParisMaterial(); break; - case "raiders": mat = new RaidersMaterial(); break; + case "blueSky": mat = new BlueSkyMaterial(); break; + case "darkBlur": mat = new DarkBlurMaterial(); break; //case "zinvert": mat = new ZInvertMaterial(); break; //case "deform": mat = new DeformMaterial(); break; //case "star": mat = new StarMaterial(); break; -- cgit v1.2.3 From 6403ec6d21048c93138ddcbcc59fc4677121ed5e Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 19 Jul 2012 15:53:54 -0700 Subject: Timeline: updated livePreview to timeline play. Hide canvas and draw red outline - Changed the play button to a toggle button - livePreview code in stage activated via bindings - Draw a red outline of the canvas when in play Signed-off-by: Valerio Virgillito --- js/models/app-model.js | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'js/models') diff --git a/js/models/app-model.js b/js/models/app-model.js index 52e298a5..1351921b 100755 --- a/js/models/app-model.js +++ b/js/models/app-model.js @@ -34,19 +34,6 @@ var Montage = require("montage/core/core").Montage, exports.AppModel = Montage.create(Component, { - _livePreview: { - value: false - }, - - livePreview: { - get: function() { - return this._livePreview; - }, - set: function(value) { - this._livePreview = value; - } - }, - _layoutView: { value: "layoutAll" }, -- cgit v1.2.3 From b59bb17d10a0f5c9c2e5ce0eb1e0e1c7da6c92f6 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 20 Jul 2012 15:51:27 -0700 Subject: Unifying the banner and animation template display of ninja-content In the banner and animation template the stage element now shows div in both the pi and breadcrumb. IKNINJA: 1776 Signed-off-by: Valerio Virgillito --- js/models/element-model.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'js/models') diff --git a/js/models/element-model.js b/js/models/element-model.js index 07abbd40..7d8e6ebb 100755 --- a/js/models/element-model.js +++ b/js/models/element-model.js @@ -53,7 +53,7 @@ var modelGenerator = exports.modelGenerator = function() { }) }); - if(this._model.selection !== "body") { + if(this._model.selection !== "body" && this.nodeName.toLowerCase() !== "ninja-content") { this._model.props3D.init(this, false); } @@ -75,9 +75,9 @@ var getInfoForElement = function(el) { } if(el.nodeName.toLowerCase() === "ninja-content") { - elementName = "body"; - controller = elementNameToController(elementName); - pi = elementNameToPi(elementName); + elementName = "div"; + controller = elementNameToController("body"); + pi = elementNameToPi("body"); } // TODO: Add this in case there is no controller for the component -- cgit v1.2.3