js_stack 1.2.0 → 1.2.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d83924ef0dcc40e5a469877302edf44b98a68a80
4
- data.tar.gz: 25d0177f8fb03943266ad6de0400fff71bca14b5
3
+ metadata.gz: 6604de5323557403972d16f6c48da43ecab2f29d
4
+ data.tar.gz: 92652c55018ffcfb6b6cbd6a71fd3f9fd29e96b8
5
5
  SHA512:
6
- metadata.gz: 35e1a85ce1452d1761f1f45417c3daff6800906e7162882d2dfc122ad75b58944b3c41f2cac2e667904849b23357b5dde1857c910b9c9b5502ae6b5293d8949c
7
- data.tar.gz: 014a1d41cb23594a24a3ecaf327b41c269992d0715ddf724767e05367d80fe03882c15088197f284cf82057bb19cb30dcef24f8a211a010a39f4d4f6330d57e7
6
+ metadata.gz: c860eeef034c59af8736c1b369722fb4a4929398e9a47702d54a7a96e0599b0ed7b35cbf1065e474b5fc56dc5a7085c9bbdba046141f0113f1d71abfaa9c036d
7
+ data.tar.gz: 0b1c70dc89cb553bbf209722a97482cd4fbac909e0171ef58e2046922c0084fa6b712e5b1b7030b9fbc092374b851710f736f8a194996a14a237d9310102c44f
data/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # Changelog
2
2
 
3
+ # 1.2.1
4
+
5
+ * update marionette 2.2.0 -> 2.2.1 [@gvl]
6
+
3
7
  # 1.2.0
4
8
 
5
9
  * update marionette 2.1.0 -> 2.2.0 [@gvl]
data/README.md CHANGED
@@ -48,7 +48,7 @@ Examples:
48
48
  | Library | Versions | Changelog | Homepage |
49
49
  | :-----: | :------: | :-------: | :------: |
50
50
  | backbone | **1.1.2**, 1.0.0 | [changelog](http://backbonejs.org/#changelog) | [homepage](http://backbonejs.org/) |
51
- | marionette | **2.2.0**, 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/) |
51
+ | 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/) |
52
52
  | underscore | **1.7.0**, 1.6.0, 1.5.2 | [changelog](http://underscorejs.org/#changelog) | [homepage](http://underscorejs.org/) |
53
53
  | hamlcoffee | **1.16** | [changelog](https://github.com/netzpirat/haml_coffee_assets/blob/master/CHANGELOG.md) | [homepage](https://github.com/netzpirat/haml_coffee_assets) |
54
54
  | js-routes | **0.9.9** | [changelog](https://github.com/railsware/js-routes/blob/master/CHANGELOG.md) | [homepage](https://github.com/railsware/js-routes) |
@@ -1,3 +1,3 @@
1
1
  module JsStack
2
- VERSION = '1.2.0'
2
+ VERSION = '1.2.1'
3
3
  end
@@ -1,6 +1,6 @@
1
1
  // MarionetteJS (Backbone.Marionette)
2
2
  // ----------------------------------
3
- // v2.2.0
3
+ // v2.2.1
4
4
  //
5
5
  // Copyright (c)2014 Derick Bailey, Muted Solutions, LLC.
6
6
  // Distributed under MIT license
@@ -493,7 +493,7 @@
493
493
 
494
494
  var Marionette = Backbone.Marionette = {};
495
495
 
496
- Marionette.VERSION = '2.2.0';
496
+ Marionette.VERSION = '2.2.1';
497
497
 
498
498
  Marionette.noConflict = function() {
499
499
  root.Marionette = previousMarionette;
@@ -1744,7 +1744,7 @@
1744
1744
  // Call destroy on each behavior after
1745
1745
  // destroying the view.
1746
1746
  // This unbinds event listeners
1747
- // that behaviors have registerd for.
1747
+ // that behaviors have registered for.
1748
1748
  _.invoke(this._behaviors, 'destroy', args);
1749
1749
 
1750
1750
  return this;
@@ -1985,7 +1985,6 @@
1985
1985
  });
1986
1986
 
1987
1987
  /* jshint maxstatements: 14 */
1988
- /* jshint maxlen: 200 */
1989
1988
 
1990
1989
  // Collection View
1991
1990
  // ---------------
@@ -2006,12 +2005,7 @@
2006
2005
  var initOptions = options || {};
2007
2006
  this.sort = _.isUndefined(initOptions.sort) ? true : initOptions.sort;
2008
2007
 
2009
- if (initOptions.collection && !(initOptions.collection instanceof Backbone.Collection)) {
2010
- throw new Marionette.Error('The Collection option passed to this view needs to be an instance of a Backbone.Collection');
2011
- }
2012
-
2013
2008
  this.once('render', this._initialEvents);
2014
-
2015
2009
  this._initChildViewStorage();
2016
2010
 
2017
2011
  Marionette.View.apply(this, arguments);
@@ -2704,7 +2698,6 @@
2704
2698
 
2705
2699
  // Add a single region, by name, to the layoutView
2706
2700
  addRegion: function(name, definition) {
2707
- this.triggerMethod('before:region:add', name);
2708
2701
  var regions = {};
2709
2702
  regions[name] = definition;
2710
2703
  return this._buildRegions(regions)[name];
@@ -2718,7 +2711,6 @@
2718
2711
 
2719
2712
  // Remove a single region from the LayoutView, by name
2720
2713
  removeRegion: function(name) {
2721
- this.triggerMethod('before:region:remove', name);
2722
2714
  delete this.regions[name];
2723
2715
  return this.regionManager.removeRegion(name);
2724
2716
  },
@@ -1 +1 @@
1
- //= require js_stack/base/marionette/2.2.0
1
+ //= require js_stack/base/marionette/2.2.1
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: js_stack
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 1.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tomasz Pewiński
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-09-12 00:00:00.000000000 Z
12
+ date: 2014-10-09 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: haml_coffee_assets
@@ -114,7 +114,7 @@ files:
114
114
  - vendor/assets/javascripts/js_stack/base/marionette/1.8.8.js
115
115
  - vendor/assets/javascripts/js_stack/base/marionette/2.0.3.js
116
116
  - vendor/assets/javascripts/js_stack/base/marionette/2.1.0.js
117
- - vendor/assets/javascripts/js_stack/base/marionette/2.2.0.js
117
+ - vendor/assets/javascripts/js_stack/base/marionette/2.2.1.js
118
118
  - vendor/assets/javascripts/js_stack/base/underscore.js
119
119
  - vendor/assets/javascripts/js_stack/base/underscore/1.5.2.js
120
120
  - vendor/assets/javascripts/js_stack/base/underscore/1.6.0.js