projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 91da280)
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
authorWolfram Schneider <wosch@indexdata.dk>
Mon, 11 Aug 2014 14:56:18 +0000 (14:56 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Mon, 11 Aug 2014 14:56:18 +0000 (14:56 +0000)
examples/htdocs/mkws-widget-ru-requirejs.html [new file with mode: 0644] patch | blob
examples/htdocs/mkws-widget-ru.js patch | blob | history
src/mkws-core.js patch | blob | history

diff --git a/examples/htdocs/mkws-widget-ru-requirejs.html b/examples/htdocs/mkws-widget-ru-requirejs.html
new file mode 100644 (file)
index 0000000..dfbcd54
--- /dev/null
+++ b/examples/htdocs/mkws-widget-ru-requirejs.html
@@ -0,0 +1,32 @@
+<html>
+<head>
+  <title>MKWS Reference Universe</title>
+  <link rel="stylesheet" type="text/css" href="mkws-widget-ru.css" />
+</head>
+
+<body>
+  <script src="http://requirejs.org/docs/release/2.1.14/minified/require.js" type="text/javascript"></script>
+  <script type="text/javascript">
+  require.config({
+    paths: {
+        mkws           : "//mkws-dev.indexdata.com/tools/htdocs/mkws-complete",
+        mkws_widget_ru : "mkws-widget-ru"
+    },
+    shim : {
+        mkws : {
+          exports : "mkws"
+        },
+        mkws_widget_ru : {
+          deps    : [ "mkws" ]
+        }
+    }
+  });
+
+  require(['mkws_widget_ru'], function() { mkws.init_widgets("requirejs is done"); } );
+  </script>
+
+  <div style="max-width: 18em; margin: 1.5em 1.5em">
+    <div class="mkwsReferenceUniverse" autosearch="sushi"></div>
+  </div>
+</body>
+</html>
diff --git a/examples/htdocs/mkws-widget-ru.js b/examples/htdocs/mkws-widget-ru.js
index c358f8f..55b4488 100644 (file)
--- a/examples/htdocs/mkws-widget-ru.js
+++ b/examples/htdocs/mkws-widget-ru.js
@@ -1,4 +1,6 @@
-var mkws_config = {service_proxy_auth: "http://mkws.indexdata.com/service-proxy/?command=auth&action=login&username=paratext&password=paratext_mkc"};
+var mkws_config = {
+   service_proxy_auth: "http://mkws.indexdata.com/service-proxy/?command=auth&action=login&username=paratext&password=paratext_mkc"
+};
 
 mkws.registerWidgetType('ReferenceUniverse', function() {
   if (!this.config.perpage) this.config.perpage = 5;
@@ -31,3 +33,4 @@ mkws.registerWidgetType('ReferenceUniverse', function() {
   }); 
   that.autosearch();
 });
+
diff --git a/src/mkws-core.js b/src/mkws-core.js
index a3a1ac9..94060a2 100644 (file)
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -632,8 +632,21 @@ mkws.pagerNext = function(tname) {
       runAutoSearches();
     }
   };
-  $(document).ready(function() {
+
+  // callback for calls after page load, e.g. requirejs
+  mkws.init_widgets = function (message) {
+    if (message) mkws.log(message);
+
     var widgetSelector = selectorForAllWidgets();
-    if (widgetSelector && $(widgetSelector).length !== 0) init();
+    if (widgetSelector && $(widgetSelector).length !== 0) {
+      init();
+    } else {
+       mkws.log("no widgets found");
+    }
+  };
+
+  $(document).ready(function() {
+    mkws.init_widgets();
   });
+
 })(mkws.$);
MasterKey Widget Set