Fix DI bug with view prototype inheritance

lexich · Aug 27, 2014 · e23da53 · e23da53
1 parent 956d10c
commit e23da53
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/dist/backbone-mixin.coffee b/dist/backbone-mixin.coffee
@@ -249,10 +249,10 @@ MixinBackbone = (Backbone)->
           @_$_p.diViews[key] = ViewClass
         else if typeof(ViewClass) is "function"
           TypeView = ViewClass
-          key = TypeView::_$_di or (TypeView::_$_di = _.uniqueId("_$_di"))
+          key = TypeView._$_di or (TypeView._$_di = _.uniqueId("_$_di"))
         else
           TypeView = ViewClass.type
-          TypeView::_$_di or (TypeView::_$_di = _.uniqueId("_$_di"))
+          TypeView._$_di or (TypeView._$_di = _.uniqueId("_$_di"))
           key =  ViewClass.key
         diview = @_$_p.diViews[key]
         removeFlag = !!diview?._$_p?.removeFlag

diff --git a/test/check-DI-spec.coffee b/test/check-DI-spec.coffee
@@ -44,7 +44,7 @@ describe "Check MixinBackbone DI",->
     keys = @view._diViewsKeys()
     values = @view._diViewsValues()
     expect(1).toBe _.size(keys)
-    expect(@TestViewDI::_$_di).toBe keys[0]
+    expect(@TestViewDI._$_di).toBe keys[0]
     expect(1).toBe _.size(values)
     expect(view1).toBe values[0]
 
@@ -54,4 +54,10 @@ describe "Check MixinBackbone DI",->
     view2 = @view.getViewDI @TestViewDI
     expect(view2?._$_p?.removeFlag).toBe false
 
+  it "correct work with prototype inheritance", ->
+    ParentView = Backbone.View.extend {}
+    ChildView = ParentView.extend {}
 
+    parentView = @view.getViewDI ParentView
+    childView = @view.getViewDI ChildView
+    expect(parentView).not.toBe childView