Merge branch 'release/2.0.1'

joomlatools · Oct 2, 2014 · f4aa84c · f4aa84c
2 parents 49ab1e1 + 74d56e3
commit f4aa84c
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 18 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.0.0</version>
+    <version>2.0.1</version>
     <description></description>
 
     <scriptfile>script.php</scriptfile>

diff --git a/code/libraries/koowa/components/com_koowa/template/helper/behavior.php b/code/libraries/koowa/components/com_koowa/template/helper/behavior.php
@@ -66,7 +66,7 @@ public function jquery($config = array())
             if (version_compare(JVERSION, '3.0', 'ge'))
             {
                 JHtml::_('jquery.framework');
-                JHtml::_('script', 'media/koowa/com_koowa/js/koowa.jquery.js', false, false, false, false, false);
+                JHtml::_('script', 'media/koowa/com_koowa/js/koowa.kquery.js', false, false, false, false, false);
             }
             else $html .= parent::jquery($config);
 

diff --git a/code/libraries/koowa/components/com_koowa/template/helper/bootstrap.php b/code/libraries/koowa/components/com_koowa/template/helper/bootstrap.php
@@ -91,13 +91,13 @@ public function load($config = array())
 
             if ($config->load_base)
             {
-                if (!file_exists($template.'/disable-joomlatools-bootstrap')) {
+                if (!file_exists($template.'/disable-koowa-bootstrap.txt')) {
                     $html .= '<ktml:style src="media://koowa/com_koowa/css/bootstrap.css" />';
                 }
             }
             else
             {
-                if (file_exists($template.'/enable-joomlatools-bootstrap')) {
+                if (file_exists($template.'/enable-koowa-bootstrap.txt')) {
                     $html .= '<ktml:style src="media://koowa/com_koowa/css/bootstrap.css" />';
                 }
             }

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.0.0';
+    const VERSION = '2.0.1';
 
     /**
      * The root path

diff --git a/code/media/koowa/com_koowa/js/koowa.js b/code/media/koowa/com_koowa/js/koowa.js
@@ -43,15 +43,7 @@ if (!Function.prototype.bind) {
  * https://github.com/ded/klass
  * License MIT (c) Dustin Diaz & Jacob Thornton 2012
  */
-
-    /** @exports klass */
-!function (name, context, definition) {
-    if (typeof define == 'function') define(definition)
-    //else if (typeof module != 'undefined') module.exports = definition() //@NOTE this breaks qunit
-    else context[name] = definition()
-}('klass', this,
-    /** @exports klass */
-    function () {
+var klass = (function () {
     var context = this
         , old = context.klass
         , f = 'function'
@@ -139,7 +131,7 @@ if (!Function.prototype.bind) {
     }
 
     return klass
-});
+})();
 
 $(function() {
     $('.submittable').on('click.koowa', function(event){

diff --git a/.../media/koowa/com_koowa/js/koowa.jquery.js → .../media/koowa/com_koowa/js/koowa.kquery.js b/.../media/koowa/com_koowa/js/koowa.jquery.js → .../media/koowa/com_koowa/js/koowa.kquery.js
diff --git a/code/media/koowa/com_koowa/js/koowa.min.js b/code/media/koowa/com_koowa/js/koowa.min.js
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.0.0</version>
+    <version>2.0.1</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.0.0</version>
+    <version>2.0.1</version>
     <description></description>
 
     <files>