Merge branch '2.1'

timble · Aug 18, 2015 · 66781ad · 66781ad
2 parents 9cb35da + 40d5693
commit 66781ad
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 8 deletions.
diff --git a/code/administrator/manifests/files/files_koowa.xml b/code/administrator/manifests/files/files_koowa.xml
@@ -7,7 +7,7 @@
     <license>GNU GPLv3 - http://www.gnu.org/licenses/gpl.html</license>
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>www.joomlatools.com</authorUrl>
-    <version>2.1.2</version>
+    <version>2.1.3</version>
     <description></description>
 
     <scriptfile>script.php</scriptfile>

diff --git a/code/libraries/koowa/libraries/koowa.php b/code/libraries/koowa/libraries/koowa.php
@@ -27,7 +27,7 @@ class Koowa
      *
      * @var string
      */
-    const VERSION = '2.1.2';
+    const VERSION = '2.1.3';
 
     /**
      * The root path

diff --git a/code/libraries/koowa/libraries/template/helper/behavior.php b/code/libraries/koowa/libraries/template/helper/behavior.php
@@ -386,7 +386,7 @@ public function tree($config = array())
         if (!isset(self::$_loaded['tree']))
         {
             $html .= $this->koowa();
-            $html .= '<ktml:script src="media://koowa/com_koowa/js/tree.jquery'.($config->debug ? '' : '.min').'.js" />';
+            $html .= '<ktml:script src="media://koowa/com_koowa/js/jqtree'.($config->debug ? '' : '.min').'.js" />';
             $html .= '<ktml:script src="media://koowa/com_koowa/js/koowa.tree'.($config->debug ? '' : '.min').'.js" />';
 
             self::$_loaded['tree'] = true;

diff --git a/code/libraries/koowa/libraries/template/helper/select.php b/code/libraries/koowa/libraries/template/helper/select.php
@@ -90,7 +90,7 @@ public function optionlist($config = array())
                 $label = $config->translate ? $this->getObject('translator')->translate( $option->label ) : $option->label;
 
                 $extra = '';
-                if(isset($option->disable) && $option->disable) {
+                if(isset($option->disabled) && $option->disabled) {
                     $extra .= 'disabled="disabled"';
                 }
 

diff --git a/code/media/koowa/com_koowa/js/tree.jquery.js → code/media/koowa/com_koowa/js/jqtree.js b/code/media/koowa/com_koowa/js/tree.jquery.js → code/media/koowa/com_koowa/js/jqtree.js
diff --git a/...dia/koowa/com_koowa/js/tree.jquery.min.js → code/media/koowa/com_koowa/js/jqtree.min.js b/...dia/koowa/com_koowa/js/tree.jquery.min.js → code/media/koowa/com_koowa/js/jqtree.min.js
diff --git a/code/media/koowa/com_koowa/js/koowa.select2.js b/code/media/koowa/com_koowa/js/koowa.select2.js
@@ -54,8 +54,15 @@
                     }
                 },
                 initSelection: function(element, callback) {
-                    var selected= $.parseJSON($(element).val());
-                    if (selected!=='') {
+                    var selected = $.parseJSON($(element).val());
+
+                    if ($.isArray(selected) && !selected.length)
+                    {
+                        selected = '';
+                        $(element).val(selected);
+                    }
+
+                    if (selected) {
                         var data = {};
                         data[options.value] = selected;
                         $.ajax(options.url, {

diff --git a/code/plugins/system/koowa/koowa.xml b/code/plugins/system/koowa/koowa.xml
@@ -7,7 +7,7 @@
     <license>GNU GPLv3 - http://www.gnu.org/licenses/gpl.html</license>
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>www.joomlatools.com</authorUrl>
-    <version>2.1.2</version>
+    <version>2.1.3</version>
     <description />
 
     <files folder="plugins/system">

diff --git a/pkg_koowa.xml b/pkg_koowa.xml
@@ -9,7 +9,7 @@
     <license>GNU GPLv3 - http://www.gnu.org/licenses/gpl.html</license>
     <authorEmail>[email protected]</authorEmail>
     <authorUrl>www.joomlatools.com</authorUrl>
-    <version>2.1.2</version>
+    <version>2.1.3</version>
     <description></description>
 
     <files>