backbone-marionette-rails 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0945d593536da471a9ef33e4d2497f62a788e856
-  data.tar.gz: c4764defcd4105080f613a12095165f426cbe4f8
+  metadata.gz: 94d02a675ee66c214b8c3207a6c5a95e1562ccb5
+  data.tar.gz: b379d3be981121e528d217798a1d5264fe311e0c
 SHA512:
-  metadata.gz: af35db2132767695a9a5df6d5d8321f1298ad73e829c17f2077f936653ea43c9bb479d283c6c5519522a96236e7c68807a042c10176d8866ded40e2b5d555d31
-  data.tar.gz: e1b7bbb931458a0e760c279ea9140b9e90d2fad27f7b58ebd8325a24e4b8bc9bdbfa621e4befdb8428e74fb39051ea610cef8671dece8adccb35f5ccff563539
+  metadata.gz: 1b2441682c35fec1438a3fa332f230092a70edfc0fd39989892b88938631ce23fa162e578ea34e3ece8ac31afd2e60f67642620496d3708f09653ede93487eca
+  data.tar.gz: 5593ae1e350cafeef713e4df75b5c30555f9906356e5df5b2f1c8b2eb3cba5afc3354a76457fc1d95a57b5cc635dfe80ef3cdd8aeba5cbeb502380301eb89ab5

data/lib/backbone-marionette-rails/version.rb

@@ -1,7 +1,7 @@
 module Backbone
   module Marionette
     module Rails
-      VERSION = "1.0.1"
+      VERSION = "1.0.2"
     end
   end
 end

data/vendor/assets/javascripts/backbone.marionette.js

@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v1.0.1
+// v1.0.2
 //
 // Copyright (c)2013 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -17,10 +17,15 @@
  * https://github.com/marionettejs/backbone.wreqr/
  */
 
-// Backbone.BabySitter, v0.0.4
-// Copyright (c)2012 Derick Bailey, Muted Solutions, LLC.
+// Backbone.BabySitter
+// -------------------
+// v0.0.5
+//
+// Copyright (c)2013 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
-// http://github.com/marionettejs/backbone.babysitter
+//
+// http://github.com/babysitterjs/backbone.babysitter
+
 // Backbone.ChildViewContainer
 // ---------------------------
 //
@@ -1330,15 +1335,16 @@ Marionette.View = Backbone.View.extend({
       return;
     }
 
-    // unbind UI elements
-    this.unbindUIElements();
-
     // mark as closed before doing the actual close, to
     // prevent infinite loops within "close" event handlers
     // that are trying to close other views
     this.isClosed = true;
     this.triggerMethod("close");
 
+    // unbind UI elements
+    this.unbindUIElements();
+
+    // remove the view from the DOM
     this.remove();
   },
 
@@ -2011,8 +2017,11 @@ Marionette.AppRouter = Backbone.Router.extend({
   // Internal method to process the `appRoutes` for the
   // router, and turn them in to routes that trigger the
   // specified method on the specified `controller`.
-  processAppRoutes: function(controller, appRoutes){
-    _.each(appRoutes, function(methodName, route) {
+  processAppRoutes: function(controller, appRoutes) {
+    var routeNames = _.keys(appRoutes).reverse(); // Backbone requires reverted order of routes
+
+    _.each(routeNames, function(route) {
+      var methodName = appRoutes[route];
       var method = controller[methodName];
 
       if (!method) {
@@ -2328,4 +2337,4 @@ _.extend(Marionette.Module, {
 
 
   return Marionette;
-})(this, Backbone, _);
+})(this, Backbone, _);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backbone-marionette-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Yujing Zheng
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies: []
 description: Vendors Backbone.Marionette Library to Rails
 email: