Fixed view shortcut scopes.

sderickson · Mar 26, 2015 · a90036e · a90036e
1 parent d09a14a
commit a90036e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/app/templates/home-view.jade b/app/templates/home-view.jade
@@ -3,4 +3,10 @@ extends /templates/common/base
 block content
   .page-header
     h1 Hello World!
-    span.glyphicon.glyphicon-search
+    span.glyphicon.glyphicon-search
+
+  ul.list-group
+    li.list-group-item
+      a(href="/test/client") Client Tests
+    li.list-group-item
+      a(href="/test/server") Server Tests
diff --git a/dist/frimfram.js b/dist/frimfram.js
diff --git a/dist/frimfram.js.map b/dist/frimfram.js.map
diff --git a/src/BaseClass.coffee b/src/BaseClass.coffee
@@ -10,7 +10,10 @@ class BaseClass
 
   listenToShortcuts: ->
     shortcuts = @superMerge('shortcuts')
-    @scope = _.uniqueId('class-scope-')
+    if @scope
+      @stopListeningToShortcuts()
+    else
+      @scope = _.uniqueId('class-scope-')
     for shortcut, func of shortcuts
       func = @[func] if not _.isFunction(func)
       continue unless func

diff --git a/src/BaseView.coffee b/src/BaseView.coffee
@@ -54,6 +54,10 @@ class BaseView extends Backbone.View
 
   listenToShortcuts: (recurse) ->
     shortcuts = @superMerge('shortcuts')
+    if @scope
+      @stopListeningToShortcuts()
+    else
+      @scope = _.uniqueId('view-scope-')
     for shortcut, func of @shortcuts
       func = @[func] if not _.isFunction(func)
       continue unless func