Merge pull request #48 from rapid7/42/carpenterRadio-command-not-a-fu…

…nction

Fix '`carpenterRadio.command` is not a function' error

bower.json

@@ -15,7 +15,7 @@
     "cocktail": "0.5.8",
     "jquery": "2.1.1",
     "backbone.marionette": "2.3.0",
-    "backbone.radio": "0.8.3",
+    "backbone.radio": "1.0.2",
     "backbone.paginator": "1.0.0",
     "compass-mixins": "0.12.5",
     "jquery-resizable-columns": "0.1.3"

dist/marionette.carpenter.js

@@ -456,11 +456,11 @@ define('controllers/application_controller',[], function() {
       this._attachRadio();
       Controller.__super__.constructor.call(this, options);
       this._instance_id = _.uniqueId("controller");
-      this.carpenterRadio.command("register:instance", this, this._instance_id);
+      this.carpenterRadio.request("register:instance", this, this._instance_id);
     }
 
     Controller.prototype.destroy = function() {
-      this.carpenterRadio.command("unregister:instance", this, this._instance_id);
+      this.carpenterRadio.request("unregister:instance", this, this._instance_id);
       return Controller.__super__.destroy.apply(this, arguments);
     };
 
@@ -495,7 +495,7 @@ define('controllers/application_controller',[], function() {
 
     Controller.prototype._manageView = function(view, options) {
       if (options.loading) {
-        return this.carpenterRadio.command("show:loading", view, options);
+        return this.carpenterRadio.request("show:loading", view, options);
       } else {
         return options.region.show(view);
       }

src/controllers/application_controller.js.coffee

@@ -13,11 +13,11 @@ define [
         @_attachRadio()
         super options
         @_instance_id = _.uniqueId("controller")
-        @carpenterRadio.command "register:instance", @, @_instance_id
+        @carpenterRadio.request "register:instance", @, @_instance_id
 
       # Unregisters the Controller from the app and closes itself
       destroy: ->
-        @carpenterRadio.command "unregister:instance", @, @_instance_id
+        @carpenterRadio.request "unregister:instance", @, @_instance_id
         super
 
       # Shows the specified view in the desired region. If a Controller
@@ -65,7 +65,7 @@ define [
       _manageView: (view, options) ->
         if options.loading
           ## show the loading view
-          @carpenterRadio.command "show:loading", view, options
+          @carpenterRadio.request "show:loading", view, options
         else
           options.region.show view
 

src/sass/table.scss

@@ -327,5 +327,5 @@ $table-row-hover-color: #efefef;
     width: 100px;
   }
 
-  @import "jquery.resizableColumns";
+  @import "jquery.resizableColumns.scss";
 }