js_stack 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33417a98914df0c29f0366cc92b33fcb56adcdc9
-  data.tar.gz: a84af44932b4b450f53de35837111b6115d62c3f
+  metadata.gz: d9f603311866504b9b463fdd55ecb2a6b8643acd
+  data.tar.gz: b91820141e0ed714afa4b096682fe79e35535fcb
 SHA512:
-  metadata.gz: c1febad1e16971d9d3d6560bec7688fb118dc3b247523412a72c0a43e076394e2049c21d5085d1a502ccfaeffc3fbe8cd509601fb95658af4044302444d10429
-  data.tar.gz: d3d99f95e85b3e328036a195a71474a77fa26b69ba62aa3e4b106c293809c506b312098c584ba90e21fb06115f14ca4a32d0893257ce9500b02b9b67b58ea388
+  metadata.gz: b590e0d01b3105c868b46e1369a416d7e53abfa7fd95dae06cee18c5bf67e9f516e8a7be34ae49751712d3f40980b1d2d4e911ad9963a4e40944390b3fbd10eb
+  data.tar.gz: 37633f97fb6f965852a4d68d83ee608dde32b2a032edff59f5b1e47cdc689f810eeeb438ef7d3cc75b3474088d1fcc5550ebacb2aef16369fc11b06de6608441

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# 1.2.3
+
+* update marionette 2.2.1 -> 2.2.2 [@gvl]
+
 # 1.2.2
 
 * update backbone.virtualcollection 0.5.1 -> 0.5.2 [@gvl]

data/README.md

@@ -48,7 +48,7 @@ Examples:
 | Library | Versions | Changelog | Homepage |
 | :-----: | :------: | :-------: | :------: |
 | backbone | **1.1.2**, 1.0.0 | [changelog](http://backbonejs.org/#changelog) | [homepage](http://backbonejs.org/) |
-| marionette | **2.2.1**, 2.1.0, 2.0.3, 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/) |
+| marionette | **2.2.2**, 2.1.0, 2.0.3, 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.7.0**, 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.9** | [changelog](https://github.com/railsware/js-routes/blob/master/CHANGELOG.md) | [homepage](https://github.com/railsware/js-routes) |

data/lib/js_stack/version.rb

@@ -1,3 +1,3 @@
 module JsStack
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

data/vendor/assets/javascripts/js_stack/base/marionette/{2.2.1.js → 2.2.2.js}

@@ -1,6 +1,6 @@
 // MarionetteJS (Backbone.Marionette)
 // ----------------------------------
-// v2.2.1
+// v2.2.2
 //
 // Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
 // Distributed under MIT license
@@ -493,7 +493,7 @@
 
   var Marionette = Backbone.Marionette = {};
 
-  Marionette.VERSION = '2.2.1';
+  Marionette.VERSION = '2.2.2';
 
   Marionette.noConflict = function() {
     root.Marionette = previousMarionette;
@@ -843,7 +843,7 @@
   var errorProps = ['description', 'fileName', 'lineNumber', 'name', 'message', 'number'];
 
   Marionette.Error = Marionette.extend.call(Error, {
-    urlRoot: 'http://marionettejs.com/docs/' + Marionette.VERSION + '/',
+    urlRoot: 'http://marionettejs.com/docs/v' + Marionette.VERSION + '/',
 
     constructor: function(message, options) {
       if (_.isObject(message)) {
@@ -1145,18 +1145,21 @@
     show: function(view, options){
       this._ensureElement();
 
-      var showOptions = options || {};
+      var showOptions     = options || {};
       var isDifferentView = view !== this.currentView;
-      var preventDestroy =  !!showOptions.preventDestroy;
-      var forceShow = !!showOptions.forceShow;
+      var preventDestroy  = !!showOptions.preventDestroy;
+      var forceShow       = !!showOptions.forceShow;
 
-      // we are only changing the view if there is a view to change to begin with
+      // We are only changing the view if there is a current view to change to begin with
       var isChangingView = !!this.currentView;
 
-      // only destroy the view if we don't want to preventDestroy and the view is different
-      var _shouldDestroyView = !preventDestroy && isDifferentView;
+      // Only destroy the current view if we don't want to `preventDestroy` and if
+      // the view given in the first argument is different than `currentView`
+      var _shouldDestroyView = isDifferentView && !preventDestroy;
 
-      // show the view if the view is different or if you want to re-show the view
+      // Only show the view given in the first argument if it is different than
+      // the current view or if we want to re-show the view. Note that if
+      // `_shouldDestroyView` is true, then `_shouldShowView` is also necessarily true.
       var _shouldShowView = isDifferentView || forceShow;
 
       if (isChangingView) {
@@ -1174,7 +1177,7 @@
         // If this happens we need to remove the reference
         // to the currentView since once a view has been destroyed
         // we can not reuse it.
-        view.once('destroy', _.bind(this.empty, this));
+        view.once('destroy', this.empty, this);
         view.render();
 
         if (isChangingView) {
@@ -1184,11 +1187,12 @@
         this.triggerMethod('before:show', view);
         Marionette.triggerMethodOn(view, 'before:show');
 
+        this.attachHtml(view);
+
         if (isChangingView) {
           this.triggerMethod('swapOut', this.currentView);
         }
 
-        this.attachHtml(view);
         this.currentView = view;
 
         if (isChangingView) {
@@ -1238,6 +1242,7 @@
       // we should not remove anything
       if (!view) { return; }
 
+      view.off('destroy', this.empty, this);
       this.triggerMethod('before:empty', view);
       this._destroyView();
       this.triggerMethod('empty', view);

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

@@ -1 +1 @@
-//= require js_stack/base/marionette/2.2.1
+//= require js_stack/base/marionette/2.2.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: js_stack
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Tomasz Pewiński
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-19 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml_coffee_assets
@@ -114,7 +114,7 @@ files:
 - vendor/assets/javascripts/js_stack/base/marionette/1.8.8.js
 - vendor/assets/javascripts/js_stack/base/marionette/2.0.3.js
 - vendor/assets/javascripts/js_stack/base/marionette/2.1.0.js
-- vendor/assets/javascripts/js_stack/base/marionette/2.2.1.js
+- vendor/assets/javascripts/js_stack/base/marionette/2.2.2.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