From: Mike Taylor Date: Wed, 22 Jan 2014 15:53:24 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws X-Git-Tag: 1.0.0~1669 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=933299da5719f2b5d12f00ee632ca4fd1ceb1c44;hp=6c3b7b4205ac5f08bba8838ea840801c03088312;p=mkws-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws --- diff --git a/examples/htdocs/README b/examples/htdocs/README index 9a22f5b..a1f96b1 100644 --- 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 index 0000000..1ac6aa7 --- /dev/null +++ b/examples/htdocs/jasmine-local-popup.html @@ -0,0 +1,60 @@ + + + + MKWS demo: jQuery popup plugin with jasmine test framework + + + + + + + + + + + + + + + + + + + + + + + + + + + + 
+An embryonic MasterKey Widget Set
+=================================
+
+This directory contains an embryonic MasterKey Widget Set, based
+initially on "jsdemo" though now far removed from those beginnnings.
+[...]
+
+ + diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html index 1ac6aa7..305b728 100644 --- a/examples/htdocs/jasmine-popup.html +++ b/examples/htdocs/jasmine-popup.html @@ -28,16 +28,6 @@