projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 9094da1)
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Mon, 16 Dec 2013 16:00:34 +0000 (16:00 +0000)
committerMike Taylor <mike@indexdata.com>
Mon, 16 Dec 2013 16:00:34 +0000 (16:00 +0000)
examples/htdocs/jasmine-popup.html patch | blob | history
examples/htdocs/jasmine.html patch | blob | history
tools/htdocs/mkws.js patch | blob | history

diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html
index d497361..c69891b 100644 (file)
--- a/examples/htdocs/jasmine-popup.html
+++ b/examples/htdocs/jasmine-popup.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>MKWS demo: jQuery popup plugin with jasmine</title>
+    <title>MKWS demo: jQuery popup plugin with jasmine test framework</title>
 
     <link rel="stylesheet" type="text/css" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
     <link rel="stylesheet" type="text/css" href="http://mkws.indexdata.com/mkws.css" />
diff --git a/examples/htdocs/jasmine.html b/examples/htdocs/jasmine.html
index 23f5e09..7797505 100644 (file)
--- a/examples/htdocs/jasmine.html
+++ b/examples/htdocs/jasmine.html
@@ -1,7 +1,7 @@
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>MKWS demo: Wolfram's playground</title>
+    <title>MKWS demo jasmine test framework</title>
     <link rel="stylesheet" type="text/css" href="../../tools/htdocs/mkws.css" />
     <script type="text/javascript">
       var mkws_config = {
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 6c07d2d..8ebdb0b 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -7,7 +7,7 @@
 var mkws = {
     sort: 'relevance',
     authenticated: false,
-    filters: [],
+    filters: []
 };
 
 /*
MasterKey Widget Set