lalala 4.1.0.dev.359 → 4.1.0.dev.360

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2f879f7d205bf4f6ad05d96df8aa753eba20fe4a
4
- data.tar.gz: d39c215776c492932b2382f76e7c2a4b08048461
3
+ metadata.gz: 72b0d5b875b5e051bcd1546c445433f1e9c2f291
4
+ data.tar.gz: 2e8149049bf0a2f9b9098dccf552fa144a31eaba
5
5
  SHA512:
6
- metadata.gz: b5c77c56f9cdc569571fa2dd963699da8a65264cb00b4fcbb17f8b1a716ea7d7c645302008dfdfdd075525429403773695b3744470a997e13c31c586445d1ff5
7
- data.tar.gz: 239d96d788377440ea6a2315baf5bafae813985c5db62c10c18900734c693923bc4655d32981080cb809231974c57ed2aa7714564a3bd64548fa0516f8415a35
6
+ metadata.gz: 5c335c89f15c81d131476cbce2ce5285d141959f2756b46b69e86c4b46e42770cb65bf12475b00fd2dab879a671771dbfb3182e3761b3a0bad93f2d736052144
7
+ data.tar.gz: e30ae0b74e02f521da9057de35d52ce57dd095d0f9ff3c322d98aeba8915bf124e3d1259938b84996efc62861bb78e991742f8b9ddbeecce75983e1bbe97be12
@@ -71,51 +71,58 @@ CPT.prototype.addTriggers = function() {
71
71
  CPT.prototype.initStates = function() {
72
72
  var _this = this;
73
73
 
74
+ // Close all
75
+ this.$tree_parents.each(function() {
76
+ var $tree_parent = $(this),
77
+ $target = $tree_parent.data('collapsible_target'),
78
+ $trigger = $tree_parent.find('.collapse');
79
+
80
+ _this.update($target, $trigger, 'close', false);
81
+ });
82
+
83
+ // Open saved states
74
84
  $.each(this.states, function(idx, value) {
75
85
  var $tree_parent = $('#' + value),
76
86
  $target = $tree_parent.data('collapsible_target'),
77
87
  $trigger = $tree_parent.find('.collapse');
78
88
 
79
- _this.close($target, $trigger);
89
+ _this.update($target, $trigger, 'open', false);
80
90
  });
81
91
  };
82
92
 
83
93
 
84
94
  /**
85
- * Close target
95
+ * Update target state
86
96
  *
87
- * @param {jQuery object} $target The element to be closed
88
- * @param {jQuery object} $trigger The trigger element
97
+ * @param {jQuery object} $target The element to be closed
98
+ * @param {jQuery object} $trigger The trigger element
99
+ * @param {Boolean} save_state Default TRUE
89
100
  */
90
- CPT.prototype.close = function($target, $trigger) {
101
+ CPT.prototype.update = function($target, $trigger, state, save_state) {
91
102
  if ( !$target ) {
92
- console.warn('Can not find tree target');
103
+ console.warn('Collapsible tree: Can not find tree target');
93
104
  return;
94
105
  }
95
106
 
96
- $target.hide();
97
- $trigger.addClass('closed');
107
+ save_state = (typeof save_state == 'undefined') ? true : save_state;
98
108
 
99
- this.saveState();
100
- };
109
+ if ( state == 'close' ) {
110
+ $target.hide();
111
+ $trigger.addClass('closed');
101
112
 
113
+ } else if ( state == 'open') {
114
+ $target.show();
115
+ $trigger.removeClass('closed');
102
116
 
103
- /**
104
- * Open target
105
- *
106
- * @param {jQuery object} $target The element to be closed
107
- * @param {jQuery object} $trigger The trigger element
108
- */
109
- CPT.prototype.open = function($target, $trigger) {
110
- if ( !$target ) {
111
- console.warn('Can not find tree target');
117
+ } else {
118
+ console.warn('Collapsible tree: Unknown state');
112
119
  return;
113
- }
114
120
 
115
- $target.show();
116
- $trigger.removeClass('closed');
121
+ }
117
122
 
118
- this.saveState();
123
+ if ( save_state ) {
124
+ this.saveState();
125
+ }
119
126
  };
120
127
 
121
128
 
@@ -129,10 +136,10 @@ CPT.prototype.toggleState = function(event) {
129
136
  $target = $trigger.data('tree_parent').data('collapsible_target');
130
137
 
131
138
  if ( $target.is(':visible') ) {
132
- this.close($target, $trigger);
139
+ this.update($target, $trigger, 'close');
133
140
 
134
141
  } else {
135
- this.open($target, $trigger);
142
+ this.update($target, $trigger, 'open');
136
143
 
137
144
  }
138
145
 
@@ -151,7 +158,7 @@ CPT.prototype.saveState = function() {
151
158
  var $tree_parent = $(this),
152
159
  $trigger = $tree_parent.find('.collapse');
153
160
 
154
- if ( $trigger.hasClass('closed') ) {
161
+ if ( !$trigger.hasClass('closed') ) {
155
162
  new_states.push($tree_parent.attr('id'));
156
163
  }
157
164
 
@@ -1,6 +1,6 @@
1
1
  module Lalala
2
2
  VERSION = "4.1.0"
3
- BUILD = "359"
3
+ BUILD = "360"
4
4
 
5
5
  if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
6
6
  BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lalala
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.0.dev.359
4
+ version: 4.1.0.dev.360
5
5
  platform: ruby
6
6
  authors:
7
7
  - Simon Menke
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2014-10-27 00:00:00.000000000 Z
16
+ date: 2014-10-29 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: activeadmin