projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 15a5524)
Merge remote-tracking branch 'origin/master' into mkws-294
authorWolfram Schneider <wosch@indexdata.dk>
Wed, 22 Oct 2014 16:29:38 +0000 (18:29 +0200)
committerWolfram Schneider <wosch@indexdata.dk>
Wed, 22 Oct 2014 16:29:38 +0000 (18:29 +0200)
examples/htdocs/images.html patch | blob | history
src/Makefile patch | blob | history
src/mkws-core.js patch | blob | history
src/mkws-popup.js patch | blob | history
src/mkws-team.js patch | blob | history
test/Makefile patch | blob | history
test/widgets/Makefile patch | blob | history

diff --git a/examples/htdocs/images.html b/examples/htdocs/images.html
index 9fdc85b..f16bd2e 100644 (file)
--- a/examples/htdocs/images.html
+++ b/examples/htdocs/images.html
@@ -29,7 +29,6 @@
   </head>
   <body>
     <div class='mkwsRecords' autosearch='!param!q'
-       targets='pz:id=lui.indexdata.com:8080/solr4/select?fq=database:5853'
        >results will appear here</div>
   </body>
 </html>
diff --git a/src/Makefile b/src/Makefile
index 427b818..120bab6 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -114,7 +114,7 @@ html-includes:
          perl -n0e 'chomp(); print qq{    <script type="text/javascript" src="src/$$_"></script>\n}'
 
 clean distclean:
-       rm -f ${INSTALLED}
+       rm -f ${INSTALLED} mkws-templates.js
 
 help:
        @echo "make [ all | clean | release ]"
diff --git a/src/mkws-core.js b/src/mkws-core.js
index 56e7f28..b1ea66a 100644 (file)
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -493,7 +493,6 @@ mkws.log("Using window.name '" + window.name + "'");
         var myTeam = mkws.teams[tname];
         if (!myTeam) {
           myTeam = mkws.teams[tname] = mkws.makeTeam($, tname);
-          log("made MKWS team '" + tname + "'");
         }
 
         var oldHTML = this.innerHTML;
@@ -501,7 +500,7 @@ mkws.log("Using window.name '" + window.name + "'");
         myTeam.addWidget(myWidget);
         var newHTML = this.innerHTML;
         if (newHTML !== oldHTML) {
-          log("widget " + tname + ":" + type + " HTML changed: reparsing");
+          myTeam.log("widget " + type + " HTML changed: reparsing");
           makeWidgetsWithin(level+1, $(this));
         }
       });
@@ -601,7 +600,7 @@ mkws.log("Using window.name '" + window.name + "'");
     for (var tName in mkws.teams) {
       var myTeam = mkws.teams[tName]
       myTeam.makePz2();
-      log("made PZ2 object for team '" + tName + "'");
+      myTeam.log("made PZ2 object");
       /*
         myTeam.visitWidgets(function(t, w) {
           log("  has widget of type '" + t + "': " + w);
diff --git a/src/mkws-popup.js b/src/mkws-popup.js
index 74886ff..7cc3792 100644 (file)
--- a/src/mkws-popup.js
+++ b/src/mkws-popup.js
@@ -6,7 +6,7 @@
 // $(document).ready(function () {
 mkws.registerWidgetType('popup', function() {
     var $ = mkws.$;
-    var debug = mkws.log;
+    var debug = this.log;
     debug("init popup window");
 
     var popup_window = $(this.node);
diff --git a/src/mkws-team.js b/src/mkws-team.js
index 415ff79..509fc2f 100644 (file)
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -185,7 +185,7 @@ mkws.makeTeam = function($, teamName) {
     }
 
     m_paz = new pz2(params);
-    log("ccreated main pz2 object");
+    log("created main pz2 object");
   }
 
 
@@ -454,7 +454,7 @@ mkws.makeTeam = function($, teamName) {
       return template;
     }
     else {
-      mkws.log("No MKWS template for " + name);
+      log("No MKWS template for " + name);
       return null;
     }  
   }
diff --git a/test/Makefile b/test/Makefile
index 5705e4d..a7c1ea0 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -8,7 +8,7 @@ APACHE_PORT:= $(shell echo $${APACHE_PORT-4040})
 #PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html
 PHANTOMJS_PATH=jasmine-local-popup.html
 PHANTOMJS_URL=http://localhost:${APACHE_PORT}/${PHANTOMJS_PATH}
-PHANTOMJS_TIMEOUT=18
+PHANTOMJS_TIMEOUT=30
 
 NPM_INSTALL_FLAGS=-q
 JASMINE_NODE=  ./node_modules/jasmine-node/bin/jasmine-node
diff --git a/test/widgets/Makefile b/test/widgets/Makefile
index 94ff158..18a303c 100644 (file)
--- a/test/widgets/Makefile
+++ b/test/widgets/Makefile
@@ -1,6 +1,6 @@
 # Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com
 
-PHANTOMJS_TIMEOUT=18
+PHANTOMJS_TIMEOUT=30
 PHANTOMJS=     ../node_modules/phantomjs/bin/phantomjs
 IMAGES=                ./images
 SCREENSHOT_WIDTH_HEIGHT=       1000 1200
MasterKey Widget Set