Merge remote branch 'origin/wosch'

Conflicts:
	test/spec/mkws-pazpar2.js

diff --git a/src/Makefile b/src/Makefile
index 1eb58ee..365a7c2 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -25,6 +25,8 @@ INSTALLABLE = handlebars-v1.1.2.js \
        mkws.min.js mkws-complete.min.js VERSION NEWS
 INSTALLED = $(INSTALLABLE:%=../tools/htdocs/%)
 
+**make-default**: ../tools/htdocs/mkws.js
+
 install: $(INSTALLED)
 
 uninstall:

diff --git a/src/mkws-core.js b/src/mkws-core.js
index 9668cd1..01f82c8 100644 (file)
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -302,21 +302,15 @@ mkws.pagerNext = function(tname) {
        }
     }
 
-
-    // I don't understand why I need this copy, but I do: mkws_config
-    // is not visible inside the document.ready function, but the
-    // saved copy is.
-    var saved_config;
-    if (typeof mkws_config === 'undefined') {
-       log("setting empty config");
-       saved_config = {};
-    } else {
-       log("using config: " + $.toJSON(mkws_config));
-       saved_config = mkws_config;
-    }
-
-
     $(document).ready(function() {
+       var saved_config;
+       if (typeof mkws_config === 'undefined') {
+           log("setting empty config");
+           saved_config = {};
+       } else {
+           log("using config: " + $.toJSON(mkws_config));
+           saved_config = mkws_config;
+       }
        mkws.setMkwsConfig(saved_config);
 
        for (var key in mkws.config) {