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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f879f7d205bf4f6ad05d96df8aa753eba20fe4a
-  data.tar.gz: d39c215776c492932b2382f76e7c2a4b08048461
+  metadata.gz: 72b0d5b875b5e051bcd1546c445433f1e9c2f291
+  data.tar.gz: 2e8149049bf0a2f9b9098dccf552fa144a31eaba
 SHA512:
-  metadata.gz: b5c77c56f9cdc569571fa2dd963699da8a65264cb00b4fcbb17f8b1a716ea7d7c645302008dfdfdd075525429403773695b3744470a997e13c31c586445d1ff5
-  data.tar.gz: 239d96d788377440ea6a2315baf5bafae813985c5db62c10c18900734c693923bc4655d32981080cb809231974c57ed2aa7714564a3bd64548fa0516f8415a35
+  metadata.gz: 5c335c89f15c81d131476cbce2ce5285d141959f2756b46b69e86c4b46e42770cb65bf12475b00fd2dab879a671771dbfb3182e3761b3a0bad93f2d736052144
+  data.tar.gz: e30ae0b74e02f521da9057de35d52ce57dd095d0f9ff3c322d98aeba8915bf124e3d1259938b84996efc62861bb78e991742f8b9ddbeecce75983e1bbe97be12

data/app/assets/javascripts/lalala/modules/collapsible_pages_tree.module.js

@@ -71,51 +71,58 @@ CPT.prototype.addTriggers = function() {
 CPT.prototype.initStates = function() {
   var _this = this;
 
+  // Close all
+  this.$tree_parents.each(function() {
+    var $tree_parent = $(this),
+        $target      = $tree_parent.data('collapsible_target'),
+        $trigger     = $tree_parent.find('.collapse');
+
+    _this.update($target, $trigger, 'close', false);
+  });
+
+  // Open saved states
   $.each(this.states, function(idx, value) {
     var $tree_parent = $('#' + value),
         $target      = $tree_parent.data('collapsible_target'),
         $trigger     = $tree_parent.find('.collapse');
 
-    _this.close($target, $trigger);
+    _this.update($target, $trigger, 'open', false);
   });
 };
 
 
 /**
- * Close target
+ * Update target state
  *
- * @param  {jQuery object} $target  The element to be closed
- * @param  {jQuery object} $trigger The trigger element
+ * @param  {jQuery object} $target    The element to be closed
+ * @param  {jQuery object} $trigger   The trigger element
+ * @param  {Boolean}       save_state Default TRUE
  */
-CPT.prototype.close = function($target, $trigger) {
+CPT.prototype.update = function($target, $trigger, state, save_state) {
   if ( !$target ) {
-    console.warn('Can not find tree target');
+    console.warn('Collapsible tree: Can not find tree target');
     return;
   }
 
-  $target.hide();
-  $trigger.addClass('closed');
+  save_state = (typeof save_state == 'undefined') ? true : save_state;
 
-  this.saveState();
-};
+  if ( state == 'close' ) {
+    $target.hide();
+    $trigger.addClass('closed');
 
+  } else if ( state == 'open') {
+    $target.show();
+    $trigger.removeClass('closed');
 
-/**
- * Open target
- *
- * @param  {jQuery object} $target  The element to be closed
- * @param  {jQuery object} $trigger The trigger element
- */
-CPT.prototype.open = function($target, $trigger) {
-  if ( !$target ) {
-    console.warn('Can not find tree target');
+  } else {
+    console.warn('Collapsible tree: Unknown state');
     return;
-  }
 
-  $target.show();
-  $trigger.removeClass('closed');
+  }
 
-  this.saveState();
+  if ( save_state ) {
+    this.saveState();
+  }
 };
 
 
@@ -129,10 +136,10 @@ CPT.prototype.toggleState = function(event) {
       $target  = $trigger.data('tree_parent').data('collapsible_target');
 
   if ( $target.is(':visible') ) {
-    this.close($target, $trigger);
+    this.update($target, $trigger, 'close');
 
   } else {
-    this.open($target, $trigger);
+    this.update($target, $trigger, 'open');
 
   }
 
@@ -151,7 +158,7 @@ CPT.prototype.saveState = function() {
     var $tree_parent = $(this),
         $trigger     = $tree_parent.find('.collapse');
 
-    if ( $trigger.hasClass('closed') ) {
+    if ( !$trigger.hasClass('closed') ) {
       new_states.push($tree_parent.attr('id'));
     }
 

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.1.0"
-  BUILD   = "359"
+  BUILD   = "360"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.1.0.dev.359
+  version: 4.1.0.dev.360
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-27 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin