scrivito_content_browser 1.5.0 → 1.5.1.rc1

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: c40a409490ac7a3ce10f91d7197bc80c61e26df2
4
- data.tar.gz: a787e0eed5068176943cfec7ab6127b04811e04c
3
+ metadata.gz: deba05ccf2eba6b46a13c85ed587769742b3d3c4
4
+ data.tar.gz: d5b1a5f50d23b0dbb7f53fb88868bd04a783212a
5
5
  SHA512:
6
- metadata.gz: 0777c819b3ce87c46912d788a767e034987432a29bc30aa0fef05365a8f3533cbd4e3e9ccf3b2489dd8e219bb006e5d76ede460a0e8429a5fe0d030cb8b34d16
7
- data.tar.gz: 09e22c5de8e1e6eb4a208c475fde84d24548f82f5c36bab6b44e6d8f55ea87cd382b2ee2188bcb105aa4d0d9b3a8be1c859f9a58032cd33321300c66598b08a0
6
+ metadata.gz: 659e18500e1569f6107e1fc82ffbbf531da84cc93d9e1aa0ae68059469b18e6aae28b19a5159fae24c48cd905a11feec968baef8f933f534dfd0b163aefdf341
7
+ data.tar.gz: c231d18d6a204625405f42dbb73621b42af53bbb0fc1190c5f1627f79a476ac05e17d46ad19c51cbf9bfcd7765033dfc44334cefe288ca1c59e45b74f6a618b6
@@ -20210,20 +20210,14 @@
20210
20210
  })(this);
20211
20211
 
20212
20212
  sortInAscOrder = (function(_this) {
20213
- return function(criteriaType, filter) {
20214
- return function(dispatch, getState) {
20215
- dispatch(_changeSortOrder(criteriaType, ASC_SORT_ORDER));
20216
- return filter.trigger("reduxStateChanged", filter);
20217
- };
20213
+ return function(criteriaType) {
20214
+ return _changeSortOrder(criteriaType, ASC_SORT_ORDER);
20218
20215
  };
20219
20216
  })(this);
20220
20217
 
20221
20218
  sortInDescOrder = (function(_this) {
20222
- return function(criteriaType, filter) {
20223
- return function(dispatch, getState) {
20224
- dispatch(_changeSortOrder(criteriaType, DESC_SORT_ORDER));
20225
- return filter.trigger("reduxStateChanged", filter);
20226
- };
20219
+ return function(criteriaType) {
20220
+ return _changeSortOrder(criteriaType, DESC_SORT_ORDER);
20227
20221
  };
20228
20222
  })(this);
20229
20223
 
@@ -20839,8 +20833,7 @@
20839
20833
  "viewMode": this.props.viewMode
20840
20834
  }), React.createElement(SortMenu, {
20841
20835
  "dispatch": this.props.dispatch,
20842
- "sortCriteria": this.props.sortCriteria,
20843
- "filter": this.props.filter
20836
+ "sortCriteria": this.props.sortCriteria
20844
20837
  }));
20845
20838
  }
20846
20839
  });
@@ -22381,10 +22374,10 @@
22381
22374
  return sortIcon;
22382
22375
  },
22383
22376
  setDescSortCriteria: function(type) {
22384
- return this.props.dispatch(sortInDescOrder(type, this.props.filter));
22377
+ return this.props.dispatch(sortInDescOrder(type));
22385
22378
  },
22386
22379
  setAscSortCriteria: function(type) {
22387
- return this.props.dispatch(sortInAscOrder(type, this.props.filter));
22380
+ return this.props.dispatch(sortInAscOrder(type));
22388
22381
  },
22389
22382
  render: function() {
22390
22383
  var sortItem;
@@ -22689,19 +22682,20 @@
22689
22682
  _activeTags: function() {
22690
22683
  return this._activeTags;
22691
22684
  },
22685
+ _isBuiltInFilterSelected: function() {
22686
+ return this.state.selectedFilter || this.props.showLastAdded;
22687
+ },
22692
22688
  _triggerReduxStateChanged: function(newProps, oldProps) {
22693
- if (!_.isEqual(newProps, oldProps)) {
22689
+ if (!this._isBuiltInFilterSelected() && !_.isEqual(newProps, oldProps)) {
22694
22690
  return this.props.filter.trigger("reduxStateChanged", this.props.filter);
22695
22691
  }
22696
22692
  },
22697
22693
  componentWillReceiveProps: function(nextProps) {
22698
- if (!this.state.selectedFilter) {
22699
- this._sortCriteria = nextProps.sortCriteria;
22700
- this._triggerReduxStateChanged(this._sortCriteria, this.props.sortCriteria);
22701
- if (nextProps.tags.items.length > 0) {
22702
- this._activeTags = nextProps.tags.activeTags;
22703
- return this._triggerReduxStateChanged(this._activeTags, this.props.tags.activeTags);
22704
- }
22694
+ this._sortCriteria = nextProps.sortCriteria;
22695
+ this._triggerReduxStateChanged(this._sortCriteria, this.props.sortCriteria);
22696
+ if (nextProps.tags.items.length > 0) {
22697
+ this._activeTags = nextProps.tags.activeTags;
22698
+ return this._triggerReduxStateChanged(this._activeTags, this.props.tags.activeTags);
22705
22699
  }
22706
22700
  },
22707
22701
  _buildQuery: function(filter) {
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: scrivito_content_browser
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.0
4
+ version: 1.5.1.rc1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Scrivito
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-07-28 00:00:00.000000000 Z
11
+ date: 2016-08-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: railties
@@ -30,14 +30,14 @@ dependencies:
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 1.5.0
33
+ version: 1.5.1.rc1
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 1.5.0
40
+ version: 1.5.1.rc1
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: pry
43
43
  requirement: !ruby/object:Gem::Requirement