converted to new marionette.wreqr

marionettejs · Sep 27, 2012 · d6669ac · d6669ac
1 parent 3c2cdeb
commit d6669ac
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 18 deletions.
diff --git a/public/javascripts/bbclonemail/bbclonemail.mailapp.categories.js b/public/javascripts/bbclonemail/bbclonemail.mailapp.categories.js
@@ -39,11 +39,11 @@ BBCloneMail.module("MailApp.Categories", function(Categories, App, Backbone, Mar
     var controller = new Controller();
     Categories.controller = controller;
 
-    App.respondTo("mail:categories", controller.getAll, controller);
+    App.requestResponse.addHandler("mail:categories", controller.getAll, controller);
   });
 
   Categories.addFinalizer(function(){
-    App.removeRequestHandler("mail:categories");
+    App.requestResponse.removeHandler("mail:categories");
     delete Categories.controller;
   });
 });
diff --git a/public/javascripts/bbclonemail/bbclonemail.mailapp.mail.js b/public/javascripts/bbclonemail/bbclonemail.mailapp.mail.js
@@ -60,12 +60,12 @@ BBCloneMail.module("MailApp.Mail", function(Mail, App, Backbone, Marionette, $,
     var controller = new Controller();
     Mail.controller = controller;
 
-    App.respondTo("mail:inbox", controller.getAll, controller);
-    App.respondTo("mail:category", controller.getByCategory, controller);
+    App.requestResponse.addHandler("mail:inbox", controller.getAll, controller);
+    App.requestResponse.addHandler("mail:category", controller.getByCategory, controller);
   });
 
   Mail.addFinalizer(function(){
-    App.removeRequestHandler("mail:inbox");
+    App.requestResponse.removeHandler("mail:inbox");
     delete Mail.controller;
   });
 

diff --git a/public/javascripts/bbclonemail/bbclonemail.mailapp.mailbox.js b/public/javascripts/bbclonemail/bbclonemail.mailapp.mailbox.js
@@ -85,15 +85,15 @@ BBCloneMail.module("MailApp.Mailbox", function(Mailbox, App, Backbone, Marionett
 
     // Register command handlers to show a list of
     // email items, or a single email item
-    App.registerCommand("show:mail:list", controller.showMailList, controller);
-    App.registerCommand("show:mail:item", controller.showMailItem, controller);
+    App.commands.addHandler("show:mail:list", controller.showMailList, controller);
+    App.commands.addHandler("show:mail:item", controller.showMailItem, controller);
 
     Mailbox.controller = controller;
   });
 
   Mailbox.addFinalizer(function(){
-    App.removeCommand("show:mail:list");
-    App.removeCommand("show:mail:item");
+    App.commands.removeHandler("show:mail:list");
+    App.commands.removeHandler("show:mail:item");
 
     delete Mailbox.controller;
   });

diff --git a/public/javascripts/vendor/marionette.wreqr.js b/public/javascripts/vendor/marionette.wreqr.js
@@ -76,10 +76,7 @@ Backbone.Marionette.Wreqr = (function(Backbone, Marionette, _){
   (function(){
     "option strict";
 
-    console.log("foo");
-
     if (Backbone && Backbone.Marionette && Backbone.Marionette.Application){
-      console.log("bar");
 
       var commands = new Wreqr.Commands();
       var reqres = new Wreqr.RequestResponse();

diff --git a/spec/javascripts/inbox.spec.js b/spec/javascripts/inbox.spec.js
@@ -7,8 +7,8 @@ describe("inbox", function(){
     showMailListHandler = jasmine.createSpy("show mail list");
     getInboxHandler = jasmine.createSpy("get inbox");
 
-    BBCloneMail.registerCommand("show:mail:list", showMailListHandler);
-    BBCloneMail.respondTo("mail:inbox", getInboxHandler);
+    BBCloneMail.commands.addHandler("show:mail:list", showMailListHandler);
+    BBCloneMail.requestResponse.addHandler("mail:inbox", getInboxHandler);
 
     var emailItem = new Backbone.Model({id: 1});
     var emailList = new Backbone.Collection([emailItem]);
@@ -17,8 +17,8 @@ describe("inbox", function(){
   });
 
   afterEach(function(){
-    BBCloneMail.removeCommand("show:mail:list");
-    BBCloneMail.removeRequestHandler("mail:inbox");
+    BBCloneMail.commands.removeHandler("show:mail:list");
+    BBCloneMail.requestResponse.removeHandler("mail:inbox");
   });
 
   describe("when viewing the inbox", function(){

diff --git a/spec/javascripts/mailAppStart.spec.js b/spec/javascripts/mailAppStart.spec.js
@@ -11,15 +11,15 @@ describe("mail app start", function(){
       var catCol = new Backbone.Collection([cat]);
       getCategoriesHandler = jasmine.createSpy();
       getCategoriesHandler.andReturn(catCol);
-      BBCloneMail.respondTo("mail:categories", getCategoriesHandler);
+      BBCloneMail.requestResponse.addHandler("mail:categories", getCategoriesHandler);
 
       categoryNav = BBCloneMail.module("MailApp.CategoryNavigation");
       categoryNav.start();
     });
 
     afterEach(function(){
       categoryNav.stop();
-      BBCloneMail.removeRequestHandler("mail:categories");
+      BBCloneMail.requestResponse.removeHandler("mail:categories");
     });
 
     it("should show the list of categories", function(){