include jquery inside the widgets and toolbar

plone · Nov 12, 2013 · aa7ecb2 · aa7ecb2
1 parent 1ae8e61
commit aa7ecb2
Show file tree

Hide file tree

Showing 5 changed files with 119 additions and 22 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -175,7 +175,6 @@ module.exports = function(grunt) {
           include: 'mockup-bundles-widgets',
           insertRequire: ['mockup-bundles-widgets'],
           out: 'build/widgets.min.js',
-          excludeShallow: ['jquery']
         }
       },
       toolbar: {

diff --git a/js/bundles/toolbar.js b/js/bundles/toolbar.js
@@ -25,13 +25,6 @@
 //
 
 
-if (window.jQuery) {
-  define( "jquery", [], function () {
-    "use strict";
-    return window.jQuery;
-  } );
-}
-
 define([
   'jquery',
   'mockup-router',

diff --git a/js/bundles/toolbar_develop.js b/js/bundles/toolbar_develop.js
@@ -1,7 +1,63 @@
 (function($) {
   "use strict";
 
-  $(document).ready(function() {
+/*!
+ * domready (c) Dustin Diaz 2012 - License MIT
+ * https://github.com/ded/domready
+ *
+ * Modified just a bit by Rok Garbas 2013
+ */
+var domready = function (ready) {
+  /*jshint laxcomma:true, boss:true, scripturl:true, expr:true */
+
+  var fns = [], fn, f = false
+    , doc = document
+    , testEl = doc.documentElement
+    , hack = testEl.doScroll
+    , domContentLoaded = 'DOMContentLoaded'
+    , addEventListener = 'addEventListener'
+    , onreadystatechange = 'onreadystatechange'
+    , readyState = 'readyState'
+    , loadedRgx = hack ? /^loaded|^c/ : /^loaded|c/
+    , loaded = loadedRgx.test(doc[readyState]);
+
+  function flush(f) {
+    loaded = 1;
+    while (f = fns.shift()) f();
+  }
+
+  doc[addEventListener] && doc[addEventListener](domContentLoaded, fn = function () {
+    doc.removeEventListener(domContentLoaded, fn, f);
+    flush();
+  }, f);
+
+
+  hack && doc.attachEvent(onreadystatechange, fn = function () {
+    if (/^c/.test(doc[readyState])) {
+      doc.detachEvent(onreadystatechange, fn);
+      flush();
+    }
+  });
+
+  return (ready = hack ?
+    function (fn) {
+      self != top ?
+        loaded ? fn() : fns.push(fn) :
+        function () {
+          try {
+            testEl.doScroll('left');
+          } catch (e) {
+            return setTimeout(function() { ready(fn); }, 50);
+          }
+          fn();
+        }();
+    } :
+    function (fn) {
+      loaded ? fn() : fns.push(fn);
+    });
+}();
+
+  domready(function() {
 
     var script2 = document.createElement('script');
     script2.setAttribute('type', 'text/javascript');

diff --git a/js/bundles/widgets.js b/js/bundles/widgets.js
@@ -22,13 +22,6 @@
 //
 
 
-if (window.jQuery) {
-  define( "jquery", [], function () {
-    "use strict";
-    return window.jQuery;
-  } );
-}
-
 define([
   'jquery',
   'mockup-registry',

diff --git a/js/bundles/widgets_develop.js b/js/bundles/widgets_develop.js
@@ -1,15 +1,71 @@
-(function($) {
+(function() {
   "use strict";
 
-  $(document).ready(function() {
+/*!
+ * domready (c) Dustin Diaz 2012 - License MIT
+ * https://github.com/ded/domready
+ *
+ * Modified just a bit by Rok Garbas 2013
+ */
+var domready = function (ready) {
+  /*jshint laxcomma:true, boss:true, scripturl:true, expr:true */
+
+  var fns = [], fn, f = false
+    , doc = document
+    , testEl = doc.documentElement
+    , hack = testEl.doScroll
+    , domContentLoaded = 'DOMContentLoaded'
+    , addEventListener = 'addEventListener'
+    , onreadystatechange = 'onreadystatechange'
+    , readyState = 'readyState'
+    , loadedRgx = hack ? /^loaded|^c/ : /^loaded|c/
+    , loaded = loadedRgx.test(doc[readyState]);
+
+  function flush(f) {
+    loaded = 1;
+    while (f = fns.shift()) f();
+  }
+
+  doc[addEventListener] && doc[addEventListener](domContentLoaded, fn = function () {
+    doc.removeEventListener(domContentLoaded, fn, f);
+    flush();
+  }, f);
+
+
+  hack && doc.attachEvent(onreadystatechange, fn = function () {
+    if (/^c/.test(doc[readyState])) {
+      doc.detachEvent(onreadystatechange, fn);
+      flush();
+    }
+  });
+
+  return (ready = hack ?
+    function (fn) {
+      self != top ?
+        loaded ? fn() : fns.push(fn) :
+        function () {
+          try {
+            testEl.doScroll('left');
+          } catch (e) {
+            return setTimeout(function() { ready(fn); }, 50);
+          }
+          fn();
+        }();
+    } :
+    function (fn) {
+      loaded ? fn() : fns.push(fn);
+    });
+}();
+
+  domready(function() {
 
     var script2 = document.createElement('script');
     script2.setAttribute('type', 'text/javascript');
     script2.setAttribute('src', '/++resource++mockup/js/config.js');
     script2.onload = function() {
       requirejs.config({ baseUrl: '++resource++mockup/' });
-      if ($('[data-iframe="plone-toolbar"]').size() === 0) {
-        require(['mockup-bundles-widgets']);
+      if (document.querySelectorAll('[data-iframe="plone-toolbar"]').length !== 0){
+          require(['mockup-bundles-widgets']);
       } else {
         require(['mockup-bundles-widgets', 'mockup-iframe_init']);
       }
@@ -28,7 +84,7 @@
     style1.innerHTML = '@import (less) "/++resource++mockup/less/widgets.less"; @isBrowser: true; @pathPrefix: \'/++resource++mockup/less/\';';
     document.getElementsByTagName("head")[0].appendChild(style1);
 
-    if ($('[data-iframe="plone-toolbar"]').size() !== 0) {
+    if (document.querySelectorAll('[data-iframe="plone-toolbar"]').length !== 0) {
       var style2 = document.createElement('style');
       style2.setAttribute('type', 'text/less');
       style2.innerHTML = '@import (less) "/++resource++mockup/less/iframe_init.less"; @isBrowser: true; @pathPrefix: \'/++resource++mockup/less/\';';
@@ -42,4 +98,4 @@
 
   });
 
-}(jQuery));
+}());