From e6f9e4ba68d6d3deed4b04427abca1a97320064d Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Tue, 26 Jun 2012 13:10:16 -0700 Subject: IKNINJA-1667 - Fix for JIRA issue involving updating rule list on selection change. --- .../css-panel/rule-list-container.reel/rule-list-container.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/js/panels/css-panel/rule-list-container.reel/rule-list-container.js b/js/panels/css-panel/rule-list-container.reel/rule-list-container.js index 509ca565..f53937e6 100644 --- a/js/panels/css-panel/rule-list-container.reel/rule-list-container.js +++ b/js/panels/css-panel/rule-list-container.reel/rule-list-container.js @@ -39,11 +39,13 @@ exports.RuleListContainer = Montage.create(Component, { value: function(selection) { var list = this._getListForSelection(selection); - if(!list) { + if(list) { + this.displayedList = list; + this.update(); + } else { list = this.add(selection); + this.displayedList = list; } - - this.displayedList = list; } }, -- cgit v1.2.3 From a72b6809e214eb524f866440a55f8366f078c240 Mon Sep 17 00:00:00 2001 From: Eric Guzman Date: Tue, 26 Jun 2012 14:00:59 -0700 Subject: IKNINJA-1659 - Fix error when calling preventDefault() --- .../css-panel/rule-components/css-style-rule.reel/css-style-rule.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js index 5361e5cc..d86c8d55 100644 --- a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js +++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js @@ -96,7 +96,10 @@ exports.CssStyleRule = Montage.create(Component, { handleStop : { value: function(e) { if(this.focusDelegate) { - e._event.detail.preventDefault(); + if(e._event.detail.preventDefault) { + e._event.detail.preventDefault(); + } + this.focusDelegate.handleSelectorStop(this.rule, this.selectorField.value, this); } } -- cgit v1.2.3 From cd2d380b1f75bf310c2a8c62e2ec4e3d6f4e39f8 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 26 Jun 2012 15:41:00 -0700 Subject: fix for the youtube giving an error when having less than 3 images Signed-off-by: Valerio Virgillito --- .../montage-google/feed-reader/feed-entry.reel/feed-entry.html | 2 +- .../feed-reader/feed-reader.reel/feed-reader.html | 1 - .../montage-google/picasa-carousel.reel/picasa-carousel.html | 1 - .../montage-google/youtube-channel.reel/youtube-channel.html | 1 - .../montage-google/youtube-channel.reel/youtube-channel.js | 10 +++++----- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html index 332b2932..66471eab 100644 --- a/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html +++ b/node_modules/montage-google/feed-reader/feed-entry.reel/feed-entry.html @@ -45,7 +45,6 @@ } }, "owner": { - "prototype": "feed-reader/feed-entry.reel", "properties": { "element": {"#": "feed-entry"} } @@ -76,6 +75,7 @@

diff --git a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html index 4d6792a1..a5c1346f 100644 --- a/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html +++ b/node_modules/montage-google/feed-reader/feed-reader.reel/feed-reader.html @@ -38,7 +38,6 @@ }, "owner": { - "prototype": "feed-reader/feed-reader.reel", "properties": { "element": {"#": "feed-reader"} } diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html index 8712c228..b5949299 100755 --- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html +++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html @@ -12,7 +12,6 @@