From 226ad803165ba5a97fd827f498ccddaa2648aa2a Mon Sep 17 00:00:00 2001 From: patricklx Date: Sat, 18 Oct 2014 00:26:24 +0100 Subject: [PATCH 1/2] make popover compatible with latest ember https://github.com/emberjs/ember.js/pull/5522 --- app/scripts/components/BsPopover.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/scripts/components/BsPopover.coffee b/app/scripts/components/BsPopover.coffee index c66ef4a..7ed363f 100644 --- a/app/scripts/components/BsPopover.coffee +++ b/app/scripts/components/BsPopover.coffee @@ -384,7 +384,7 @@ Bootstrap.TooltipBoxManager = Ember.Object.create( if (typeof path is "string") and path isnt "" p = path.split(".") keyword = p[0] - o = options.data.keywords[keyword] + o = options.data.view._keywords[keyword] if o p.removeAt 0 p.insertAt 0, "this" @@ -410,7 +410,7 @@ Bootstrap.TooltipBoxManager = Ember.Object.create( #get context from keywords -> the each helper defines it p = value.split(".") keyword = p[0] - o = options.data.keywords[keyword] + o = options.data.view._keywords[keyword] unless o #no context in keywords, assuming current context From 7805dd82d386ac9b519a2ba7546a924de8da8bf4 Mon Sep 17 00:00:00 2001 From: patricklx Date: Tue, 2 Dec 2014 12:40:12 +0000 Subject: [PATCH 2/2] use stream --- app/scripts/components/BsPopover.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/scripts/components/BsPopover.coffee b/app/scripts/components/BsPopover.coffee index 7ed363f..c45bb3f 100644 --- a/app/scripts/components/BsPopover.coffee +++ b/app/scripts/components/BsPopover.coffee @@ -384,7 +384,7 @@ Bootstrap.TooltipBoxManager = Ember.Object.create( if (typeof path is "string") and path isnt "" p = path.split(".") keyword = p[0] - o = options.data.view._keywords[keyword] + o = options.data.view.getStream(keyword).value() if o p.removeAt 0 p.insertAt 0, "this" @@ -410,7 +410,7 @@ Bootstrap.TooltipBoxManager = Ember.Object.create( #get context from keywords -> the each helper defines it p = value.split(".") keyword = p[0] - o = options.data.view._keywords[keyword] + o = options.data.view.getStream(keyword).value() unless o #no context in keywords, assuming current context