Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws

diff --git a/src/mkws-core.js b/src/mkws-core.js
index 0ae5a99..ff7e475 100644 (file)
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -349,7 +349,7 @@ mkws.log("Using window.name '" + window.name + "'");
       teamName = "AUTO";
       // Autosearch widgets don't join team AUTO if there is already an
       // autosearch on the team or the team has otherwise gotten a query
-      if (node.hasAttribute("autosearch")) {
+      if (node.getAttribute("autosearch")) {
         if (mkws.autoHasAuto ||
             mkws.teams["AUTO"] && mkws.teams["AUTO"].config["query"]) {
           log("AUTO team already has a query, using unique team");

diff --git a/test/Makefile b/test/Makefile
index a7c1ea0..1b986b4 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -27,7 +27,7 @@ clean:
        rm -f images/*.png
        ${MAKE} -C./widgets $@
 
-distclean: clean clean-tmp clean-error
+distclean: apache-stop clean clean-tmp clean-error
        rm -rf node_modules
        rm -f libexec
 
@@ -42,13 +42,15 @@ clean-tmp:
 mkws-complete-syntax-check:
        ${MAKE} -C../src ../tools/htdocs/mkws-complete.min.js
 
-check check-js: mkws-complete-syntax-check
+check check-js: node-modules mkws-complete-syntax-check
+       ${JASMINE_NODE} --noColor --captureExceptions --forceexit ./spec
+
+check-node-installation:
        @if [ ! -e node_modules ]; then \
            echo "==> please run first: make node-modules"; \
            echo ""; \
            exit 1; \
        fi
-       ${JASMINE_NODE} --noColor --captureExceptions --forceexit ./spec
 
 test: check
 
@@ -110,7 +112,7 @@ apache-stop:
        @-if [ -e ${APACHE_PID_FILE} ]; then \
           kill `cat ${APACHE_PID_FILE}`; \
        else \
-          killall apache2 2> /dev/null; \
+          killall ${APACHE_HTTPD} 2> /dev/null; \
        fi
        @sleep 0.6
        rm -f ${APACHE_PID_FILE}