From d13d20285df2fcdc9f235ee4246355e955c34619 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Wed, 27 Jun 2012 15:18:03 -0700 Subject: Temporarily disable ElementMediator's addDelegate when adding components. Signed-off-by: Nivesh Rajbhandari --- js/panels/components-panel.reel/components-panel.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/panels/components-panel.reel/components-panel.js b/js/panels/components-panel.reel/components-panel.js index ab033433..073a4438 100755 --- a/js/panels/components-panel.reel/components-panel.js +++ b/js/panels/components-panel.reel/components-panel.js @@ -300,8 +300,11 @@ exports.ComponentsPanel = Montage.create(Component, { componentInstanceOnFirstDraw: { value: function(instance) { + var addDelegate = this.application.ninja.elementMediator.addDelegate; + this.application.ninja.elementMediator.addDelegate = null; this.application.ninja.elementMediator.addElements(instance.element); this.application.ninja.currentDocument.model.mObjects.push(instance); + this.application.ninja.elementMediator.addDelegate = addDelegate; } }, -- cgit v1.2.3 From 1e0b05465c120a2b17d0f8420787a1d002e4b28e Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Wed, 27 Jun 2012 21:06:25 -0700 Subject: Timeline: bug fix IKNINJA-1843 --- js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 50171260..ef13f22e 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js @@ -1773,6 +1773,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { currentLayersSelectedLength = this.currentLayersSelected.length, arrLayersLength = this.arrLayers.length, returnVal = arrLayersLength -1; + if (returnVal === -1) { + return false; + } if (this.currentLayersSelected === false) { return false; } -- cgit v1.2.3 From 7e098b5a710776439ca6ad00604e2f2011dbc4ed Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Thu, 28 Jun 2012 09:46:23 -0700 Subject: FIX layer selection bug Signed-off-by: Jonathan Duran --- js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index ef13f22e..45353a08 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js @@ -1220,7 +1220,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { for(i=0;i 0) { // this.element.classList.add("bound"); // } else { diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css index 5818eca8..1536c706 100755 --- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css +++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css @@ -11,7 +11,7 @@ font-size: 11px; box-shadow: 3px 3px 20px rgba(0, 0, 0, 0.61); border-radius: 6px; - padding: 3px 8px; + padding: 3px; text-shadow: 1px 1px 0px #000; } @@ -29,6 +29,8 @@ /*background: rgba(0, 0, 0, 0.3);*/ line-height:16px; /*box-shadow: inset 0px 0px 4px #333, 1px 1px 0px #3A3A3A;*/ + padding-top: 4px; + margin: 0 5px; min-width: 80px; } @@ -38,7 +40,10 @@ line-height:16px; padding:1px 25px 1px 8px; } - +.bindingHud .hudOption.promoted { + color: #FFF; + font-weight: bold; +} .bindingHud .hudOption .connectorBubble:hover { background-color: #1B52A7; box-shadow: inset 0px 2px 2px 1px rgba(15, 15, 15, 0.78), 0 1px #474747; @@ -94,8 +99,13 @@ } .splitter.scrollArea:hover:not(.disabled) { background-color: #303030; + border-bottom: 1px solid #252525; + box-shadow: 0 1px 0 0 #3F3F3F; +} +.splitter.scrollAreaBottom:hover:not(.disabled) { + border-bottom: 1px solid #3F3F3F; + box-shadow: 0 1px 0 0 #252525; } - .hudRepetition { overflow: hidden; diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html index 7bb888d5..f7e1a1d2 100755 --- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html +++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html @@ -36,7 +36,8 @@ "element": {"#" : "hudOption"} }, "bindings": { - "title": {"<-": "@repeater.objectAtCurrentIteration"} + "title": {"<-": "@repeater.objectAtCurrentIteration.property"}, + "promoted": {"<-": "@repeater.objectAtCurrentIteration.promoted"} } }, "resizer1": { diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js index 0f1b99c9..a62fe78d 100755 --- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js +++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js @@ -89,9 +89,17 @@ exports.BindingHud = Montage.create(Component, { getPropertyList : { value: function(component) { - var props = this.application.ninja.objectsController.getPropertiesFromObject(component, true); - - var objectName, promotedProperties; + var props = this.application.ninja.objectsController.getPropertiesFromObject(component, true), + promotedProperties = [], + objectName; + + ///// Mapper - property to property object + function propertyMapper(property) { + return { + property: property, + promoted: promotedProperties.indexOf(property) !== -1 + } + } if(this.userComponent._montage_metadata) { objectName = this.userComponent._montage_metadata.objectName; @@ -114,7 +122,7 @@ exports.BindingHud = Montage.create(Component, { } } - return props; + return props.map(propertyMapper); } }, -- cgit v1.2.3