js_stack 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b2232ea8922ab38c10202bc52364394fc45b40b
-  data.tar.gz: 0d16916c11ddae1d744622e4102088dd46b4adc5
+  metadata.gz: 42d604913131f08575650d7bdbf629b82682bb9a
+  data.tar.gz: 9d604301284dd5445aa1c79a641752e619905f68
 SHA512:
-  metadata.gz: cdb099cf43d534d149b3141691777ffdaab8e869d3ed99c0d502b2dc39581dca0ca5f92dcef9e85145259e04c254d270147210ffb1cecd59ac26bf81499e6e44
-  data.tar.gz: 3043017d6f72ba49b305fc2ea61b4b0c69df1c7b86b4a357da126a4359f339914408f6727805bf20f7041de80e771a9701eb72f009e8a20e9fc977033645c8f3
+  metadata.gz: d90c618b3ba5a4a7b714ba2ca0bbae5f74be5d208e115c5d4299cd71e91f2670c7e142c6e976ad8d7308a97346cbf843b7d6fce044dd9de66e3855eddc6822d7
+  data.tar.gz: 67325422efa348003c999fe1ac04efe29361f98502586be15942f794a4bb525e7725fedc8df210cb62ee0283acb7bd06170e360d056a53e67b62148f3cff8a06

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# 0.6.5
+
+* update marionette 1.8.5 -> 1.8.8 [@gvl]
+
 # 0.6.4
 
 * add backbone.paginator 2.0.0 [@gvl]

data/README.md

@@ -53,10 +53,10 @@ Examples:
 | Library | Versions | Changelog | Homepage |
 | :-----: | :------: | :-------: | :------: |
 | backbone | **1.1.2**, 1.0.0 | [changelog](http://backbonejs.org/#changelog) | [homepage](http://backbonejs.org/) |
-| marionette | **1.8.5**, 1.7.4, 1.6.4, 1.5.1, 1.4.1, 1.1.0 | [changelog](https://github.com/marionettejs/backbone.marionette/blob/master/changelog.md) | [homepage](http://marionettejs.com/) |
+| marionette | **1.8.8**, 1.7.4, 1.6.4, 1.5.1, 1.4.1, 1.1.0 | [changelog](https://github.com/marionettejs/backbone.marionette/blob/master/changelog.md) | [homepage](http://marionettejs.com/) |
 | underscore | **1.6.0**, 1.5.2 | [changelog](http://underscorejs.org/#changelog) | [homepage](http://underscorejs.org/) |
 | hamlcoffee | **1.16** | [changelog](https://github.com/netzpirat/haml_coffee_assets/blob/master/CHANGELOG.md) | [homepage](https://github.com/netzpirat/haml_coffee_assets) |
-| js-routes | **0.9.7** | none | [homepage](https://github.com/railsware/js-routes) |
+| js-routes | **0.9.8** | none | [homepage](https://github.com/railsware/js-routes) |
 
 ### Plugins
 
@@ -72,7 +72,7 @@ Examples:
 | backbone validation | **0.9.1**, 0.8.1 | [changelog](https://github.com/thedersen/backbone.validation#release-notes) | [homepage](https://github.com/thedersen/backbone.validation) | Yes
 | backbone virtualcollection | **0.4.15** | [changelog](https://github.com/p3drosola/Backbone.VirtualCollection#changelog) | [homepage](https://github.com/p3drosola/Backbone.VirtualCollection) | Yes
 | cocktail | **0.5.3** | none | [homepage](https://github.com/onsi/cocktail) | No
-| momentjs | **2.6.0** | [changelog](https://github.com/moment/moment/#changelog) | [homepage](https://github.com/derekprior/momentjs-rails) | No
+| momentjs | **2.7.0** | [changelog](https://github.com/moment/moment/#changelog) | [homepage](https://github.com/derekprior/momentjs-rails) | No
 | underscore inflections | **0.2.1** | none | [homepage](https://github.com/geetarista/underscore.inflections) | No
 | underscore string | **2.3.2** | [changelog](https://github.com/epeli/underscore.string#changelog) | [homepage](http://epeli.github.io/underscore.string/) | No
 > Default: library is included in `js_stack/plugins`

data/lib/js_stack/version.rb

@@ -1,3 +1,3 @@
 module JsStack
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 end

data/vendor/assets/javascripts/js_stack/base/marionette/{1.8.5.js → 1.8.8.js}

@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v1.8.5
+// v1.8.8
 //
 // Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -964,7 +964,12 @@ _.extend(Marionette.Region.prototype, Backbone.Events, {
 
     view.render();
     Marionette.triggerMethod.call(this, "before:show", view);
-    Marionette.triggerMethod.call(view, "before:show");
+
+    if (_.isFunction(view.triggerMethod)) {
+      view.triggerMethod("before:show");
+    } else {
+      Marionette.triggerMethod.call(view, "before:show");
+    }
 
     if (isDifferentView || isViewClosed) {
       this.open(view);
@@ -973,7 +978,14 @@ _.extend(Marionette.Region.prototype, Backbone.Events, {
     this.currentView = view;
 
     Marionette.triggerMethod.call(this, "show", view);
-    Marionette.triggerMethod.call(view, "show");
+
+    if (_.isFunction(view.triggerMethod)) {
+      view.triggerMethod("show");
+    } else {
+      Marionette.triggerMethod.call(view, "show");
+    }
+
+    return this;
   },
 
   ensureEl: function(){
@@ -1604,7 +1616,11 @@ Marionette.CollectionView = Marionette.View.extend({
   _triggerShowBufferedChildren: function () {
     if (this._isShown) {
       _.each(this._bufferedChildren, function (child) {
-        Marionette.triggerMethod.call(child, "show");
+        if (_.isFunction(child.triggerMethod)) {
+          child.triggerMethod('show');
+        } else {
+          Marionette.triggerMethod.call(child, 'show');
+        }
       });
       this._bufferedChildren = [];
     }
@@ -1632,7 +1648,11 @@ Marionette.CollectionView = Marionette.View.extend({
   // of child views is called.
   onShowCalled: function(){
     this.children.each(function(child){
-      Marionette.triggerMethod.call(child, "show");
+      if (_.isFunction(child.triggerMethod)) {
+        child.triggerMethod('show');
+      } else {
+        Marionette.triggerMethod.call(child, 'show');
+      }
     });
   },
 
@@ -1758,7 +1778,11 @@ Marionette.CollectionView = Marionette.View.extend({
     // call the "show" method if the collection view
     // has already been shown
     if (this._isShown && !this.isBuffering){
-      Marionette.triggerMethod.call(view, "show");
+      if (_.isFunction(view.triggerMethod)) {
+        view.triggerMethod('show');
+      } else {
+        Marionette.triggerMethod.call(view, 'show');
+      }
     }
 
     // this view was added
@@ -2272,7 +2296,6 @@ Marionette.Behaviors = (function(Marionette, _) {
     Behaviors.wrap(view, this.behaviors, [
       'bindUIElements', 'unbindUIElements',
       'delegateEvents', 'undelegateEvents',
-      'onShow', 'onClose',
       'behaviorEvents', 'triggerMethod',
       'setElement', 'close'
     ]);
@@ -2301,30 +2324,6 @@ Marionette.Behaviors = (function(Marionette, _) {
       _.invoke(behaviors, 'close', args);
     },
 
-    onShow: function(onShow, behaviors) {
-      var args = _.tail(arguments, 2);
-
-      _.each(behaviors, function(b) {
-        Marionette.triggerMethod.apply(b, ["show"].concat(args));
-      });
-
-      if (_.isFunction(onShow)) {
-        onShow.apply(this, args);
-      }
-    },
-
-    onClose: function(onClose, behaviors){
-      var args = _.tail(arguments, 2);
-
-      _.each(behaviors, function(b) {
-        Marionette.triggerMethod.apply(b, ["close"].concat(args));
-      });
-
-      if (_.isFunction(onClose)) {
-        onClose.apply(this, args);
-      }
-    },
-
     bindUIElements: function(bindUIElements, behaviors) {
       bindUIElements.apply(this);
       _.invoke(behaviors, bindUIElements);
@@ -2370,7 +2369,7 @@ Marionette.Behaviors = (function(Marionette, _) {
 
       _.each(behaviors, function(b, i) {
         var _events = {};
-        var behaviorEvents = _.result(b, 'events') || {};
+        var behaviorEvents = _.clone(_.result(b, 'events')) || {};
         var behaviorUI = _.result(b, 'ui');
 
         // Construct an internal UI hash first using

data/vendor/assets/javascripts/js_stack/base/marionette.js

@@ -1 +1 @@
-//= require js_stack/base/marionette/1.8.5
+//= require js_stack/base/marionette/1.8.8

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: js_stack
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Tomasz Pewiński
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml_coffee_assets
@@ -112,7 +112,7 @@ files:
 - vendor/assets/javascripts/js_stack/base/marionette/1.5.1.js
 - vendor/assets/javascripts/js_stack/base/marionette/1.6.4.js
 - vendor/assets/javascripts/js_stack/base/marionette/1.7.4.js
-- vendor/assets/javascripts/js_stack/base/marionette/1.8.5.js
+- vendor/assets/javascripts/js_stack/base/marionette/1.8.8.js
 - vendor/assets/javascripts/js_stack/base/underscore.js
 - vendor/assets/javascripts/js_stack/base/underscore/1.5.2.js
 - vendor/assets/javascripts/js_stack/base/underscore/1.6.0.js