projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 07b768c)
Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Tue, 12 Aug 2014 08:59:51 +0000 (08:59 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Tue, 12 Aug 2014 08:59:51 +0000 (08:59 +0000)
examples/htdocs/jasmine-local-popup.html patch | blob | history
examples/htdocs/jasmine-popup.html patch | blob | history
examples/htdocs/mike.html patch | blob | history
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/jasmine-local-popup.html b/examples/htdocs/jasmine-local-popup.html
index 792ec34..d5758b3 100644 (file)
--- a/examples/htdocs/jasmine-local-popup.html
+++ b/examples/htdocs/jasmine-local-popup.html
@@ -56,7 +56,7 @@
     var jasmine_config = {
       search_query: "netbsd",
       expected_hits: 10,
-      active_clients: 12,
+      active_clients: 13,
       check_motd: false,
       check_sortby: true,
       show_record_url: true
diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html
index 2f14059..b2c7450 100644 (file)
--- a/examples/htdocs/jasmine-popup.html
+++ b/examples/htdocs/jasmine-popup.html
@@ -59,7 +59,7 @@
     var jasmine_config = {
       search_query: "netbsd",
       expected_hits: 10,
-      active_clients: 12,
+      active_clients: 13,
       check_motd: false,
       show_record_url: true
     };
diff --git a/examples/htdocs/mike.html b/examples/htdocs/mike.html
index 934fd6e..90caf92 100644 (file)
--- a/examples/htdocs/mike.html
+++ b/examples/htdocs/mike.html
@@ -7,11 +7,8 @@
       var mkws_config = {
        pazpar2_url:        "//sp-mkws.indexdata.com/service-proxy/",
         // For now, we have to provide known-bad credentials to skip user/pw login: see bug MKSP-125
-        service_proxy_auth: undefined,
-        // Was: //sp-mkws.indexdata.com/service-proxy/?command=auth&action=perconfig&username=XXX&password=XXX
-//        pp2_hostname: "sp-mkws.indexdata.com",
-//        sp_path: "service-proxy/",
-//        credentials: "XXX/XXX",
+       service_proxy_auth: "//sp-mkws.indexdata.com/service-proxy/?command=auth&action=perconfig&username=XXX&password=XXX"
+        // For explicit credential-based authentication, add: &username=orex&password=orexmkc
       };
     </script>
     <script type="text/javascript" src="//code.jquery.com/jquery-1.10.0.min.js"></script>
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..fc6e691
--- /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.indexdata.com/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 3c2ff2a..94060a2 100644 (file)
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -166,11 +166,7 @@ mkws.setMkwsConfig = function(overrides) {
   var config_default = {
     use_service_proxy: true,
     pazpar2_url:        "//mkws.indexdata.com/service-proxy/",
-    service_proxy_auth: undefined, // generally rolled from the next three properties
-    // Was: //mkws.indexdata.com/service-proxy-auth
-    pp2_hostname: "mkws.indexdata.com",
-    sp_path: "service-proxy-auth",
-    credentials: undefined,
+    service_proxy_auth: "//mkws.indexdata.com/service-proxy-auth",
     lang: "",
     sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
     perpage_options: [10, 20, 30, 50],
@@ -627,28 +623,8 @@ mkws.pagerNext = function(tname) {
       }
     */
 
-    function sp_auth_url(config) {
-      if (config.service_proxy_auth) {
-        mkws.log("using pre-baked sp_auth_url '" + config.service_proxy_auth + "'");
-        return config.service_proxy_auth;
-      } else {
-        var s = '//';
-        s += config.auth_hostname ? config.auth_hostname : config.pp2_hostname;
-        s += '/' + config.sp_path + '?command=auth&action=perconfig';
-        var c = config.credentials;
-        if (c) {
-          if (c) {
-            s += ('&username=' + c.substr(0, c.indexOf('/')) +
-                  '&password=' + c.substr(c.indexOf('/')+1));
-          }
-        }
-        mkws.log("generated sp_auth_url '" + s + "'");
-        return s;
-      }
-    }
-
     if (mkws.config.use_service_proxy) {
-      authenticateSession(sp_auth_url(mkws.config),
+      authenticateSession(mkws.config.service_proxy_auth,
                           mkws.config.service_proxy_auth_domain,
                           mkws.config.pazpar2_url);
     } else {
@@ -656,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