Add mkws.objectInheritingFrom function, code is from Douglas

[mkws-moved-to-github.git] / src / mkws-core.js

diff --git a/src/mkws-core.js b/src/mkws-core.js
index b5f29a3..6b1e0f6 100644 (file)
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -96,14 +96,14 @@ mkws.log = function(string) {
 };
 
 
-mkws.objectWithParent = function(parent) {
-    function thing() {} // Must be function so `prototype' works
-
-    thing.prototype = parent;
-    var res = new thing();
-    thing.prototype = null;
-    return res;
-};
+// This function is taken from a StackOverflow answer
+// http://stackoverflow.com/questions/901115/how-can-i-get-query-string-values-in-javascript/901144#901144
+mkws.getParameterByName = function(name) {
+    name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
+    var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
+       results = regex.exec(location.search);
+    return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
+}
 
 
 mkws.registerWidgetType = function(name, fn) {
@@ -116,15 +116,13 @@ mkws.promotionFunction = function(name) {
 };
 
 
-mkws.defaultMkwsConfig = function() {
-    // Define empty mkws_config for simple applications that don't define it.
-    if (mkws_config == null || typeof mkws_config != 'object') {
-       var mkws_config = {};
-    }
-
-    mkws.config = mkws_config;
+mkws.setMkwsConfig = function(overrides) {
+    // Set global log_level flag early so that mkws.log() works
+    // Fall back to old "debug_level" setting for backwards compatibility
+    var tmp = overrides.log_level;
+    if (typeof(tmp) === 'undefined') tmp = overrides.debug_level;
+    if (typeof(tmp) !== 'undefined') mkws.log_level = tmp;
 
-    /* default mkws config */
     var config_default = {
        use_service_proxy: true,
        pazpar2_url: "//mkws.indexdata.com/service-proxy/",
@@ -146,26 +144,25 @@ mkws.defaultMkwsConfig = function() {
        dummy: "dummy"
     };
 
-    // Set global log_level flag early so that log() works
-    // Fall back to old "debug_level" setting for backwards compatibility
-    var tmp = mkws.config.log_level;
-    if (typeof(tmp) === 'undefined') tmp = mkws.config.debug_level;
-
-    if (typeof(tmp) !== 'undefined') {
-       mkws.log_level = tmp;
-    } else if (typeof(config_default.log_level) !== 'undefined') {
-       mkws.log_level = config_default.log_level;
-    }
-
-    /* override standard config values by function parameters */
-    for (var k in config_default) {
-       if (typeof mkws.config[k] === 'undefined')
-           mkws.config[k] = config_default[k];
-       //log("Set config: " + k + ' => ' + mkws.config[k]);
+    mkws.config = mkws.objectInheritingFrom(config_default);
+    for (var k in overrides) {
+       mkws.config[k] = overrides[k];
     }
 };
 
 
+// This code is from Douglas Crockford's article "Prototypal Inheritance in JavaScript"
+// http://javascript.crockford.com/prototypal.html
+// mkws.objectInheritingFrom behaves the same as Object.create,
+// but since the latter is not available in IE8 we can't use it.
+//
+mkws.objectInheritingFrom = function(o) {
+    function F() {}
+    F.prototype = o;
+    return new F();
+}
+
+
 // The following functions are dispatchers for team methods that
 // are called from the UI using a team-name rather than implicit
 // context.
@@ -313,13 +310,20 @@ mkws.pagerNext = function(tname) {
        log("running auto searches");
 
        for (var teamName in mkws.teams) {
-           mkws.teams[teamName].runAutoSearch();
+           mkws.teams[teamName].queue("ready").publish();
        }
     }
 
-
     $(document).ready(function() {
-       mkws.defaultMkwsConfig();
+       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) {
            if (mkws.config.hasOwnProperty(key)) {