Minor changes of jqKeyboard namespace

Now the global variable is not overwritten meaning that the lib and layout load order doesn't affect the workflow.
hawkgs · Dec 12, 2015 · 1e2686b · 1e2686b
1 parent c5332f2
commit 1e2686b
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/buildno.json b/buildno.json
@@ -1,3 +1,3 @@
 {
-  "build": 122
+  "build": 123
 }
diff --git a/demos/main.html b/demos/main.html
@@ -92,9 +92,7 @@
                     $balloon.addClass("shrink");
                 }, 500);
 
-                //setTimeout(function () {
-                    $infoTxt.delay(1000).fadeIn();
-                //}, 1000);
+                $infoTxt.delay(1000).fadeIn();
 
                 $(this).click(function () {
                     $("#button-hint").fadeOut();

diff --git a/development/built/jqkeyboard.js b/development/built/jqkeyboard.js
@@ -3,10 +3,12 @@
  * @version v1.0.0
  * @link https://github.com/hAWKdv/jqKeyboard#readme
  * @license MIT
- * @build 122
+ * @build 123
  */
 /* globals -jqKeyboard */
-var jqKeyboard = (function($) {
+var jqKeyboard = jqKeyboard || {};
+
+(function(jqKeyboard, $) {
     "use strict";
 
         // CONSTANTS
@@ -647,7 +649,5 @@ Core = {
 };
 
 
-    return {
-        init: Core.init
-    };
-}(jQuery));
+    jqKeyboard.init = Core.init;
+}(jqKeyboard, jQuery));
diff --git a/development/index.html b/development/index.html
@@ -7,8 +7,8 @@
         <link rel="stylesheet" href="css/jqkeyboard.css" />
         <script type="text/javascript" src="libs/jquery/dist/jquery.min.js"></script>
         <script type="text/javascript" src="libs/jquery-ui/jquery-ui.min.js"></script>
-        <script type="text/javascript" src="built/jqkeyboard.js"></script>
         <script type="text/javascript" src="../layouts/jqk.layout.en-bg.js"></script>
+        <script type="text/javascript" src="built/jqkeyboard.js"></script>
         <script type="text/javascript">
             $(function () {
                "use strict";

diff --git a/development/modules/_main.js b/development/modules/_main.js
@@ -1,4 +1,6 @@
-var jqKeyboard = (function($) {
+var jqKeyboard = jqKeyboard || {};
+
+(function(jqKeyboard, $) {
     "use strict";
 
         // CONSTANTS
@@ -30,7 +32,5 @@ var jqKeyboard = (function($) {
 
 //<%= contents %>
 
-    return {
-        init: Core.init
-    };
-}(jQuery));
+    jqKeyboard.init = Core.init;
+}(jqKeyboard, jQuery));
diff --git a/layouts/jqk.layout.en-bg.js b/layouts/jqk.layout.en-bg.js
@@ -1,4 +1,6 @@
 /* English - Bulgarian */
+var jqKeyboard = jqKeyboard || {};
+
 jqKeyboard.layouts = [{
     lang: "en",
     layout: ["`|~ 1|! 2|@ 3|# 4|$ 5|% 6|^ 7|& 8|* 9|( 0|) -|_ =|+ <<backspace>>",

diff --git a/layouts/jqk.layout.en.js b/layouts/jqk.layout.en.js
@@ -1,4 +1,6 @@
 /* English */
+var jqKeyboard = jqKeyboard || {};
+
 jqKeyboard.layouts = [{
     lang: "en",
     layout: ["`|~ 1|! 2|@ 3|# 4|$ 5|% 6|^ 7|& 8|* 9|( 0|) -|_ =|+ <<backspace>>",