- +

Flatten -- cgit v1.2.3 From d917e865cbc7fd8929e068aeba967af1bd64c5e7 Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Mon, 30 Apr 2012 17:34:11 -0700 Subject: Timeline: bug fix: disable bread crumb setlevel. --- js/panels/Timeline/Layer.reel/Layer.js | 1 + js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'js/panels') diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index 0fb91634..b23da749 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js @@ -558,6 +558,7 @@ var Layer = exports.Layer = Montage.create(Component, { }, didDraw: { value: function() { + // console.log("Layer.didDraw: Layer "+ this.layerID ); if (this._isFirstDraw === true) { if (this.isSelected === true) { if (this.application.ninja.currentDocument._uuid === this._docUUID) { diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 64303cef..6e64cde0 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js @@ -705,7 +705,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { // there is a currentDocument. We don't do anything at that time. return; } - this.application.ninja.currentDocument.setLevel = true; + // this.application.ninja.currentDocument.setLevel = true; this._boolCacheArrays = false; this.clearTimelinePanel(); this._boolCacheArrays = true; -- cgit v1.2.3 From 5a74b74e8ec76d60cadf623cabaa0b667f1c4058 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 2 May 2012 11:08:59 -0700 Subject: code cleanup Signed-off-by: Valerio Virgillito --- js/panels/properties.reel/properties.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'js/panels') diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js index ee90cd64..8c2daa14 100755 --- a/js/panels/properties.reel/properties.js +++ b/js/panels/properties.reel/properties.js @@ -208,11 +208,7 @@ exports.Properties = Montage.create(Component, { this.threeD.zAngle = ElementsMediator.get3DProperty(stage, "zAngle"); } - if(ElementsMediator.getProperty(stage, "-webkit-transform-style") === "preserve-3d") { - this.threeD.flatten = false; - } else { - this.threeD.flatten = true; - } + this.threeD.flatten = ElementsMediator.getProperty(stage, "-webkit-transform-style") !== "preserve-3d"; if(this.customPi !== stage.elementModel.pi) { // We need to unregister color chips from the previous selection from the Color Model -- cgit v1.2.3 From 4feaf41f201e56c1332208851d7dee4f060aaf89 Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Thu, 3 May 2012 09:59:47 -0700 Subject: Changing ID to Montage-ID for Color Panel --- js/panels/color/colorchippopup.reel/colorchippopup.html | 2 +- js/panels/color/colorpanelbase.reel/colorpanelbase.html | 2 +- js/panels/color/colorpanelpopup.reel/colorpanelpopup.html | 2 +- js/panels/color/colortoolbar.reel/colortoolbar.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'js/panels') diff --git a/js/panels/color/colorchippopup.reel/colorchippopup.html b/js/panels/color/colorchippopup.reel/colorchippopup.html index ff0c6498..cdb26894 100755 --- a/js/panels/color/colorchippopup.reel/colorchippopup.html +++ b/js/panels/color/colorchippopup.reel/colorchippopup.html @@ -28,7 +28,7 @@ -

diff --git a/js/panels/color/colorpanelbase.reel/colorpanelbase.html b/js/panels/color/colorpanelbase.reel/colorpanelbase.html index f40bd448..19bc4b6b 100755 --- a/js/panels/color/colorpanelbase.reel/colorpanelbase.html +++ b/js/panels/color/colorpanelbase.reel/colorpanelbase.html @@ -26,7 +26,7 @@ -

diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html index 0698a6dc..f65d5bc0 100755 --- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html +++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html @@ -26,7 +26,7 @@ -

diff --git a/js/panels/color/colortoolbar.reel/colortoolbar.html b/js/panels/color/colortoolbar.reel/colortoolbar.html index e32a475c..6561ed99 100755 --- a/js/panels/color/colortoolbar.reel/colortoolbar.html +++ b/js/panels/color/colortoolbar.reel/colortoolbar.html @@ -28,7 +28,7 @@ -

-- cgit v1.2.3 From 92e7297c153b432ede5b95d86cd934c990ebe768 Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Thu, 3 May 2012 10:57:45 -0700 Subject: Dom Manipulation Signed-off-by: Kruti Shah --- .../Timeline/TimelinePanel.reel/TimelinePanel.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'js/panels') diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 70e04b4c..66ef1b97 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js @@ -278,6 +278,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { _dragLayerID : { value: null }, + + layersDragged:{ + value:[], + writable:true + }, + dragLayerID : { get: function() { return this._dragLayerID; @@ -302,6 +308,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { var dragLayerIndex = this.getLayerIndexByID(this.dragLayerID), dropLayerIndex = this.getLayerIndexByID(this.dropLayerID), dragLayer = this.arrLayers[dragLayerIndex]; + this.layersDragged.push(dragLayer); + this._layerDroppedInPlace = this.arrLayers[dropLayerIndex]; this.arrLayers.splice(dragLayerIndex, 1); this.arrLayers.splice(dropLayerIndex, 0, dragLayer); @@ -403,6 +411,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { this._deleteHelper = false; } } + this.application.ninja.elementMediator.reArrangeDOM(this.layersDragged , this._layerDroppedInPlace); + this.layersDragged =[]; } } }, @@ -903,15 +913,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { } }, - - - - - - - - - deselectTweens:{ value:function () { for (var i = 0; i < this.selectedTweens.length; i++) { @@ -1038,7 +1039,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { this._openDoc = false; - } }, -- cgit v1.2.3 From 2078bfa96afaef40acb4edac99848ba55e808ef1 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 3 May 2012 15:15:21 -0700 Subject: Refactor creating elements. Removed makeNJElement and separated the model creation Signed-off-by: Valerio Virgillito --- .../components-panel.reel/components-panel.js | 64 ++++++++++------------ 1 file changed, 30 insertions(+), 34 deletions(-) (limited to 'js/panels') diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js index 79eac37b..4169423b 100755 --- a/js/panels/components-panel.reel/components-panel.js +++ b/js/panels/components-panel.reel/components-panel.js @@ -317,81 +317,77 @@ exports.ComponentsPanel = Montage.create(Component, { switch(name) { case "anchor": - el = NJUtils.makeNJElement("a", "Anchor", "component"); - el.elementModel.pi = "AnchorPi"; + el = document.application.njUtils.make("a", null, this.application.ninja.currentDocument); + document.application.njUtils.createModelForComponent(el, "Anchor"); el.setAttribute("href", "http://www.motorola.com"); el.innerHTML = "link"; break; case "button": - el = NJUtils.makeNJElement(name, "Button", "component"); - el.elementModel.pi = "ButtonPi"; + el = document.application.njUtils.make(name, null, this.application.ninja.currentDocument); + document.application.njUtils.createModelForComponent(el, "Button"); el.setAttribute("type", "button"); el.innerHTML = "Button"; break; case "checkbox": - el = NJUtils.makeNJElement("input", "Checkbox", "component"); - el.elementModel.pi = "CheckboxPi"; + el = document.application.njUtils.make("input", null, this.application.ninja.currentDocument); + document.application.njUtils.createModelForComponent(el, "Checkbox"); el.setAttribute("type", "checkbox"); break; case "imageComponent": - el = NJUtils.makeNJElement("image", "Image", "component"); - el.elementModel.pi = "ImagePi"; + el = document.application.njUtils.make("image", null, this.application.ninja.currentDocument); + document.application.njUtils.createModelForComponent(el, "Image"); el.setAttribute("width", 200); el.setAttribute("height", 200); break; case "numberInput": - el = NJUtils.makeNJElement("input", "Number Input", "component"); - el.elementModel.pi = "NumberInputPi"; + el = document.application.njUtils.make("input", null, this.application.ninja.currentDocument); + document.application.njUtils.createModelForComponent(el, "Number Input"); el.setAttribute("type", "number"); break; case "select": - el = NJUtils.makeNJElement("select", "Select", "component"); - el.elementModel.pi = "SelectInputPi"; + el = document.application.njUtils.make("select", null, this.application.ninja.currentDocument); + document.application.njUtils.createModelForComponent(el, "Select"); break; case "radioButton": - el = NJUtils.makeNJElement("input", "Radio Button", "component"); - el.elementModel.pi = "RadioButtonPi"; + el = document.application.njUtils.make("input", null, this.application.ninja.currentDocument); + document.application.njUtils.createModelForComponent(el, "Radio Button"); el.setAttribute("type", "radio"); break; case "rangeInput": - el = NJUtils.makeNJElement("input", "Range Input", "component"); - el.elementModel.pi = "RangeInputPi"; + el = document.application.njUtils.make("input", null, this.application.ninja.currentDocument); + document.application.njUtils.createModelForComponent(el, "Range Input"); el.setAttribute("type", "range"); break; case "textfield": case "searchfield": - el = NJUtils.makeNJElement("input", "Textfield", "component"); - el.elementModel.pi = "TextfieldPi"; + el = document.application.njUtils.make("input", null, this.application.ninja.currentDocument); + document.application.njUtils.createModelForComponent(el, "Textfield"); el.setAttribute("type", "text"); break; case "textarea": - el = NJUtils.makeNJElement("textarea", "TextArea", "component"); - el.elementModel.pi = "TextareaPi"; + el = document.application.njUtils.make("textarea", null, this.application.ninja.currentDocument); + document.application.njUtils.createModelForComponent(el, "TextArea"); break; case "toggleButton": - el = NJUtils.makeNJElement("button", "Toggle Button", "component"); - el.elementModel.pi = "ToggleButtonPi"; + el = document.application.njUtils.make("button", null, this.application.ninja.currentDocument); + document.application.njUtils.createModelForComponent(el, "Toggle Button"); el.innerHTML = "Off"; break; case "map": - el = NJUtils.makeNJElement("div", "Map", "component"); - el.elementModel.pi = "MapPi"; - el.elementModel.isComponent = true; + el = document.application.njUtils.make("div", null, this.application.ninja.currentDocument); + document.application.njUtils.createModelForComponent(el, "Map"); break; case "feedreader": - el = NJUtils.makeNJElement("div", "Feed Reader", "component"); - el.elementModel.pi = "FeedReaderPi"; - el.elementModel.isComponent = true; + el = document.application.njUtils.make("div", null, this.application.ninja.currentDocument); + document.application.njUtils.createModelForComponent(el, "Feed Reader"); break; case "picasa-carousel": - el = NJUtils.makeNJElement("div", "Picasa Carousel", "component"); - el.elementModel.pi = "PicasaCarouselPi"; - el.elementModel.isComponent = true; + el = document.application.njUtils.make("div", null, this.application.ninja.currentDocument); + document.application.njUtils.createModelForComponent(el, "Picasa Carousel"); break; case "youtube-channel": - el = NJUtils.makeNJElement("div", "Youtube Channel", "component"); - el.elementModel.pi = "YoutubeChannelPi"; - el.elementModel.isComponent = true; + el = document.application.njUtils.make("div", null, this.application.ninja.currentDocument); + document.application.njUtils.createModelForComponent(el, "Youtube Channel"); break; } -- cgit v1.2.3 From f1f2e65712d7c5a163dd6fdbd8f5911555c3f377 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 3 May 2012 17:46:23 -0700 Subject: finishing to replace all id with data-montage-id Signed-off-by: Valerio Virgillito --- js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html | 6 +++--- .../ComputedStyleSubPanel.html | 8 ++++---- js/panels/Panel.reel/Panel.html | 14 +++++++------- js/panels/PanelContainer.reel/PanelContainer.html | 2 +- js/panels/components-panel.reel/components-panel.html | 4 ++-- .../animations-presets.reel/animations-presets.html | 4 ++-- js/panels/presets/content.reel/content.html | 12 ++++++------ .../presets/style-presets.reel/style-presets.html | 4 ++-- .../transitions-presets.reel/transitions-presets.html | 4 ++-- js/panels/properties.reel/properties.html | 16 ++++++++-------- js/panels/properties.reel/section.reel/section.html | 6 +++--- .../custom-rows/color-select.reel/color-select.html | 6 +++--- .../sections/custom-rows/dual-row.reel/dual-row.html | 6 +++--- .../custom-rows/single-row.reel/single-row.html | 4 ++-- .../properties.reel/sections/custom.reel/custom.html | 6 +++--- .../position-and-size.reel/position-and-size.html | 18 +++++++++--------- 16 files changed, 60 insertions(+), 60 deletions(-) (limited to 'js/panels') diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html index c62b2b23..1d74fab4 100755 --- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html +++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html @@ -38,13 +38,13 @@ -

Stylesheets

@@ -59,7 +59,7 @@ 0 elements selected -

diff --git a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html index 53c243a8..25196bc6 100755 --- a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html +++ b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html @@ -26,10 +26,10 @@ -

diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html index a0e1bbe9..f0fb1044 100755 --- a/js/panels/Panel.reel/Panel.html +++ b/js/panels/Panel.reel/Panel.html @@ -135,19 +135,19 @@ -

- - Panel - + + Panel +

diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html index e5cbbe32..dfdaa6c5 100755 --- a/js/panels/PanelContainer.reel/PanelContainer.html +++ b/js/panels/PanelContainer.reel/PanelContainer.html @@ -96,7 +96,7 @@ -

diff --git a/js/panels/components-panel.reel/components-panel.html b/js/panels/components-panel.reel/components-panel.html index c78988e0..1a257957 100755 --- a/js/panels/components-panel.reel/components-panel.html +++ b/js/panels/components-panel.reel/components-panel.html @@ -53,8 +53,8 @@ -

diff --git a/js/panels/presets/animations-presets.reel/animations-presets.html b/js/panels/presets/animations-presets.reel/animations-presets.html index d333cf97..347e5497 100644 --- a/js/panels/presets/animations-presets.reel/animations-presets.html +++ b/js/panels/presets/animations-presets.reel/animations-presets.html @@ -48,8 +48,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot -

\ No newline at end of file diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html index 27928670..50a48389 100644 --- a/js/panels/presets/content.reel/content.html +++ b/js/panels/presets/content.reel/content.html @@ -55,13 +55,13 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot -