projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: e65dff0)
Merge remote branch 'origin/master' into onload
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 19 Dec 2013 14:04:26 +0000 (14:04 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 19 Dec 2013 14:04:26 +0000 (14:04 +0000)
examples/htdocs/jasmine-onload.html [new file with mode: 0644] patch | blob
tools/htdocs/mkws.js patch | blob | history

diff --git a/examples/htdocs/jasmine-onload.html b/examples/htdocs/jasmine-onload.html
new file mode 100644 (file)
index 0000000..6516e83
--- /dev/null
+++ b/examples/htdocs/jasmine-onload.html
@@ -0,0 +1,73 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>MKWS demo jasmine test framework</title>
+    <link rel="stylesheet" type="text/css" href="../../tools/htdocs/mkws.css" />
+    <link rel="shortcut icon" type="image/png" href="../../../jasmine/lib/jasmine-1.3.1/jasmine_favicon.png">
+    <link rel="stylesheet" type="text/css" href="../../../jasmine/lib/jasmine-1.3.1/jasmine.css">
+    <style type="text/css">
+      #mkwsTermlists div.facet {
+      float:left;
+      width: 30%;
+      margin: 0.3em;
+      }
+      #mkwsStat {
+      text-align: right;
+      }
+    </style>
+  </head>
+
+  <body>
+    <table width="100%" border="0">
+      <tr>
+        <td>
+          <div id="mkwsSwitch"></div>
+          <div id="mkwsLang"></div>
+          <div id="mkwsSearch"></div>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <div style="height:500px; overflow: auto">
+            <div id="mkwsPager"></div>
+            <div id="mkwsNavi"></div>
+            <div id="mkwsRecords"></div>
+            <div id="mkwsTargets"></div>
+            <div id="mkwsRanking"></div>
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <div style="height:300px; overflow: hidden">
+            <div id="mkwsTermlists"></div>
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <div id="mkwsStat"></div>
+        </td>
+      </tr>
+    </table>
+
+    <script type="text/javascript" src="../../tools/htdocs/mkws-complete.js"></script>
+
+    <!-- SECTION jasmine -->
+    <script type="text/javascript" src="../../../jasmine/lib/jasmine-1.3.1/jasmine.js"></script>
+    <script type="text/javascript" src="../../../jasmine/lib/jasmine-1.3.1/jasmine-html.js"></script>
+    <script type="text/javascript" src="../../test/spec/true.spec.js"></script>
+    <script type="text/javascript" src="../../test/spec/mkws-config.js"></script>
+    <script type="text/javascript" src="../../test/spec/mkws-pazpar2.js"></script>
+    <script type="text/javascript" src="../../test/js/mkws-jasmine-run.js"></script>
+    <script type="text/javascript"> $(document).ready(function() { mkws_jasmine_init(); }); </script>
+    <!-- SECTION jasmine -->
+
+    <script type="text/javascript">
+      var mkws_config = {
+       perpage_default: 10
+      };
+    </script>
+
+  </body>
+</html>
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 8b40745..22230d0 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -9,17 +9,16 @@ var mkws = {
     filters: []
 };
 
-/*
- * global config object: mkws_config
- *
- * Needs to be defined in the HTML header before including this JS file.
- * Define empty mkws_config for simple applications that don't define it.
- */
+// Define empty mkws_config for simple applications that don't define it.
 if (!mkws_config)
     var mkws_config = {};
 
-// Wrapper for jQuery
-(function ($) {
+// wrapper for jQuery lib
+function _mkws($) {
+    // if (console && console.log) console.log("run _mkws()");
+
+    // call this function only once
+    if (mkws.init) return;
 
 mkws.locale_lang = {
     "de": {
@@ -100,6 +99,7 @@ mkws.debug_function = function (string) {
     console.log(timestamp + string);
 }
 var debug = mkws.debug_function; // local alias
+debug("start running MKWS");
 
 
 Handlebars.registerHelper('json', function(obj) {
@@ -214,7 +214,7 @@ for (var key in mkws_config) {
     }
 }
 
-
+debug("Create main pz2 object");
 // create a parameters array and pass it to the pz2's constructor
 // then register the form submit event with the pz2.search function
 // autoInit is set to true on default
@@ -422,7 +422,7 @@ function onFormSubmitEventHandler()
 function newSearch(query, sort, targets)
 {
     debug("newSearch: " + query);
-   
+
     if (mkws_config.use_service_proxy && !mkws.authenticated) {
        alert("searching before authentication");
        return;
@@ -1274,11 +1274,8 @@ function init_popup(obj) {
       });
 };
 
-
-
-
-/* magic */
-$(document).ready(function() {
+// main
+(function() {
     try {
        mkws_html_all()
     }
@@ -1287,6 +1284,17 @@ $(document).ready(function() {
        mkws_config.error = e.message;
        // alert(e.message);
     }
-});
+})();
+
+    // done
+    mkws.init = true;
+};
+
 
+// wrapper to call _mkws after page load
+(function (j) {
+    $(document).ready(function() {
+       // if (console && console.log) console.log("on load ready");
+       _mkws(j);
+    });
 })(jQuery);
MasterKey Widget Set