projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 6c3b7b4)
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Wed, 22 Jan 2014 15:53:24 +0000 (15:53 +0000)
committerMike Taylor <mike@indexdata.com>
Wed, 22 Jan 2014 15:53:24 +0000 (15:53 +0000)
examples/htdocs/README patch | blob | history
examples/htdocs/jasmine-local-popup.html [new file with mode: 0644] patch | blob
examples/htdocs/jasmine-popup.html patch | blob | history

diff --git a/examples/htdocs/README b/examples/htdocs/README
index 9a22f5b..a1f96b1 100644 (file)
--- a/examples/htdocs/README
+++ b/examples/htdocs/README
@@ -27,7 +27,8 @@ popup.html
 
 Jasmine test pages
 ------------------
-jasmine-popup.html     - jasmine test with jquery popup, best for development
+jasmine-popup.html     - jasmine test with jquery popup, best for JS/HTML testing
+jasmine-local-popup.html  jasmine test with local SP and jquery popup, best for development
 jasmine-pp2.html       - running with local pazpar2 instead SP
 jasmine.html           - standard jasmine test
 
diff --git a/examples/htdocs/jasmine-local-popup.html b/examples/htdocs/jasmine-local-popup.html
new file mode 100644 (file)
index 0000000..1ac6aa7
--- /dev/null
+++ b/examples/htdocs/jasmine-local-popup.html
@@ -0,0 +1,60 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>MKWS demo: jQuery popup plugin with jasmine test framework</title>
+
+    <link rel="stylesheet" type="text/css" href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
+    <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
+
+    <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
+    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/mkws.js"></script>
+
+    <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">
+    <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"> mkws_jasmine_init(500); </script>
+  </head>
+
+  <body>
+    <script type="text/javascript">
+    var mkws_config = { show_lang: true,
+      pazpar2_url:          "/service-proxy/",
+      service_proxy_auth:   "/service-proxy-auth"
+    };
+
+    var jasmine_config = {
+      search_query: "pankow",
+      max_hits: 40,
+      show_record_url: false
+    };
+
+    jQuery.pazpar2({
+        "layout": "popup",               /* "table" [default], "div", "popup" */
+        "id_button": "input#mkwsButton", /* submit button id in search field */
+        "id_popup": "#mkwsPopup",        /* internal id of popup window */
+        "width": 990,                    /* popup width, should be at least 800 */
+        "height": 760                    /* popup height, should be at least 600 */
+    });
+    </script>
+
+    <pre>
+An embryonic MasterKey Widget Set
+=================================
+
+This directory contains an embryonic MasterKey Widget Set, based
+initially on "jsdemo" though now far removed from those beginnnings.
+[...]
+    </pre>
+  </body>
+</html>
diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html
index 1ac6aa7..305b728 100644 (file)
--- a/examples/htdocs/jasmine-popup.html
+++ b/examples/htdocs/jasmine-popup.html
@@ -28,16 +28,6 @@
 
   <body>
     <script type="text/javascript">
-    var mkws_config = { show_lang: true,
-      pazpar2_url:          "/service-proxy/",
-      service_proxy_auth:   "/service-proxy-auth"
-    };
-
-    var jasmine_config = {
-      search_query: "pankow",
-      max_hits: 40,
-      show_record_url: false
-    };
 
     jQuery.pazpar2({
         "layout": "popup",               /* "table" [default], "div", "popup" */
MasterKey Widget Set