Update to 1.2.3

- Fixing javascript issues with not valid hide/show tv values
Jako · Apr 7, 2016 · 10540c4 · 10540c4
1 parent 3ccec80
commit 10540c4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/assets/components/toggletvset/mgr/js/toggletvset.min.js b/assets/components/toggletvset/mgr/js/toggletvset.min.js
diff --git a/core/components/toggletvset/docs/changelog.txt b/core/components/toggletvset/docs/changelog.txt
@@ -1,6 +1,8 @@
 Changelog for ToggleTVSet
 =========================
 
+- 1.2.3
+    - Fixing javascript issues with not valid hide/show tv values
 - 1.2.2
     - Fixing toggling more than one set
 - 1.2.1

diff --git a/core/components/toggletvset/model/toggletvset/toggletvset.class.php b/core/components/toggletvset/model/toggletvset/toggletvset.class.php
@@ -27,7 +27,7 @@ class ToggleTVSet
      * The version
      * @var string $version
      */
-    public $version = '1.2.1';
+    public $version = '1.2.3';
 
     /**
      * The class options
@@ -95,24 +95,23 @@ function __construct(modX &$modx, $options = array())
                         $hidetvs = array_merge($hidetvs, array_map('trim', explode(',', $element[1])));
                     }
                 }
-                $hidetvs = array_unique($hidetvs);
+                $hidetvs = array_values(array_unique($hidetvs));
                 if ($this->modx->resource) {
                     $tvr = $modx->getObject('modTemplateVarResource', array(
                         'tmplvarid' => $toggletv,
                         'contentid' => $this->modx->resource->get('id')
                     ));
                     if ($tvr) {
                         $tvvalue = $tvr->get('value');
-                    }
-                    else {
+                    } else {
                         $tv = $modx->getObject('modTemplateVar', $toggletv);
                         $tvvalue = ($tv) ? $tv->get('default_text') : '';
                     }
                     if ($tvvalue) {
                         $showtvs = array_merge($showtvs, array_map('trim', explode(',', $tvvalue)));
                     }
                 }
-                $showtvs = array_unique($showtvs);
+                $showtvs = array_values(array_unique($showtvs));
             }
         }
 
@@ -155,10 +154,12 @@ public function getOption($key, $options = array(), $default = null)
      * @param bool $default
      * @return bool
      */
-    public function getBooleanOption($name, array $options = null, $default = null) {
+    public function getBooleanOption($name, array $options = null, $default = null)
+    {
         $option = $this->getOption($name, $options, $default);
         return $this->castValueToBool($option);
     }
+
     /**
      * Turns a value into a boolean. This checks for "false" and "no" strings, as well as anything PHP can automatically
      * cast to a boolean value.