From: Jason Skomorowski <jason@indexdata.com>
Date: Fri, 16 May 2014 05:00:11 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~666
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=82b78674032447e08477c34258c999fea92cbadc;hp=-c

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

82b78674032447e08477c34258c999fea92cbadc
diff --combined src/mkws-core.js
index c7c2863,6341087..0af84a9
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@@ -10,6 -10,7 +10,7 @@@
  // authentication, and a hash of team objects, indexed by team-name.
  //
  var mkws = {
+   $: $, // Our own local copy of the jQuery object
    authenticated: false,
    log_level: 1, // Will be overridden from mkws.config, but
                  // initial value allows jQuery popup to use logging.
@@@ -147,7 -148,8 +148,8 @@@ mkws.setMkwsConfig = function(overrides
      query_width: 50,
      show_lang: true,    /* show/hide language menu */
      show_sort: true,    /* show/hide sort menu */
-     show_perpage: true,         /* show/hide perpage menu */
+     show_perpage: true, /* show/hide perpage menu */
+     show_switch: true,  /* show/hide switch menu */
      lang_options: [],   /* display languages links for given languages, [] for all */
      facets: ["xtargets", "subject", "author"], /* display facets, in this order, [] for none */
      responsive_design_width: undefined, /* a page with less pixel width considered as narrow */
@@@ -308,10 -310,9 +310,9 @@@ mkws.pagerNext = function(tname) 
  };
  
  
- // wrapper to call team() after page load
- (function(j) {
+ // wrapper to provide local copy of the jQuery object.
+ (function($) {
    var log = mkws.log;
-   var $ = j; // XXX
  
    function handleNodeWithTeam(node, callback) {
      // First branch for DOM objects; second branch for jQuery objects
@@@ -363,11 -364,11 +364,11 @@@
            var w1 = team.widget(t + "-Container-" + from);
            var w2 = team.widget(t + "-Container-" + to);
            if (w1) {
-             $(w1.node).hide();
+             w1.node.hide();
            }
            if (w2) {
-             $(w2.node).show();
-             $(w.node).appendTo($(w2.node));
+             w2.node.show();
+             w.node.appendTo(w2.node);
            }
          });
          team.queue("resize-" + to).publish();
@@@ -382,7 -383,7 +383,7 @@@
     * for the site.
     */
    function authenticateSession(auth_url, auth_domain, pp2_url) {
-     log("Run service proxy auth URL: " + auth_url);
+     log("service proxy authentication on URL: " + auth_url);
  
      if (!auth_domain) {
        auth_domain = pp2_url.replace(/^(https?:)?\/\/(.*?)\/.*/, '$2');
@@@ -405,7 -406,7 +406,7 @@@
          return;
        }
  
-       log("Service proxy auth successfully done");
+       log("service proxy authentication successful");
        mkws.authenticated = true;
        var authName = $(data).find("displayName").text();
        // You'd think there would be a better way to do this:
@@@ -429,7 -430,7 +430,7 @@@
  
  
    function selectorForAllWidgets() {
 -    if (mkws.config.scan_all_nodes) {
 +    if (mkws.config && mkws.config.scan_all_nodes) {
        // This is the old version, which works by telling jQuery to
        // find every node that has a class beginning with "mkws". In
        // theory it should be slower than the class-based selector; but
@@@ -440,14 -441,16 +441,16 @@@
        return '[class^="mkws"],[class*=" mkws"]';
      } else {
        // This is the new version, which works by looking up the
-       // specific classes of all registered widget types. Because all
-       // it requires jQuery to do is some hash lookups in pre-built
-       // tables, it should be very fast; but it silently ignores
-       // widgets of unregistered types.
+       // specific classes of all registered widget types and their
+       // resize containers. Because all it requires jQuery to do is
+       // some hash lookups in pre-built tables, it should be very
+       // fast; but it silently ignores widgets of unregistered types.
        var s = "";
        for (var type in mkws.widgetType2function) {
  	if (s) s += ',';
  	s += '.mkws' + type;
+ 	s += ',.mkws' + type + "-Container-wide";
+ 	s += ',.mkws' + type + "-Container-narrow";
        }
        return s;
      }
@@@ -459,12 -462,12 +462,12 @@@
        handleNodeWithTeam(this, function(tname, type) {
          var myTeam = mkws.teams[tname];
          if (!myTeam) {
-           myTeam = mkws.teams[tname] = team(j, tname);
-           log("Made MKWS team '" + tname + "'");
+           myTeam = mkws.teams[tname] = team($, tname);
+           log("made MKWS team '" + tname + "'");
          }
  
          var oldHTML = this.innerHTML;
-         var myWidget = widget(j, myTeam, type, this);
+         var myWidget = widget($, myTeam, type, this);
          myTeam.addWidget(myWidget);
          var newHTML = this.innerHTML;
          if (newHTML !== oldHTML) {
@@@ -476,8 -479,7 +479,8 @@@
    }
  
  
 -  $(document).ready(function() {
 +  function init(rootsel) {
 +    if (!rootsel) var rootsel = ':root';
      var saved_config;
      if (typeof mkws_config === 'undefined') {
        log("setting empty config");
@@@ -494,7 -496,7 +497,7 @@@
            var lang = key.replace(/^language_/, "");
            // Copy custom languages into list
            mkws.locale_lang[lang] = mkws.config[key];
-           log("Added locally configured language '" + lang + "'");
+           log("added locally configured language '" + lang + "'");
          }
        }
      }
@@@ -506,17 -508,17 +509,17 @@@
        mkws.config.lang = lang;
      }
  
-     log("Locale language: " + (mkws.config.lang ? mkws.config.lang : "none"));
+     log("using language: " + (mkws.config.lang ? mkws.config.lang : "none"));
  
      if (mkws.config.query_width < 5 || mkws.config.query_width > 150) {
-       log("Reset query width: " + mkws.config.query_width);
+       log("reset query width to " + mkws.config.query_width);
        mkws.config.query_width = 50;
      }
  
      // protocol independent link for pazpar2: "//mkws/sp" -> "https://mkws/sp"
      if (mkws.config.pazpar2_url.match(/^\/\//)) {
        mkws.config.pazpar2_url = document.location.protocol + mkws.config.pazpar2_url;
-       log("adjust protocol independent links: " + mkws.config.pazpar2_url);
+       log("adjusted protocol independent link to " + mkws.config.pazpar2_url);
      }
  
      if (mkws.config.responsive_design_width) {
@@@ -542,15 -544,15 +545,15 @@@
      }
  
      var then = $.now();
 -    makeWidgetsWithin(1, $(':root'));
 +    makeWidgetsWithin(1, $(rootsel));
      var now = $.now();
  
-     log("Walking MKWS nodes took " + (now-then) + " ms");
+     log("walking MKWS nodes took " + (now-then) + " ms");
  
      /*
        for (var tName in mkws.teams) {
        var myTeam = mkws.teams[tName]
-       log("TEAM '" + tName + "' = " + myTeam + " ...");
+       log("team '" + tName + "' = " + myTeam + " ...");
        myTeam.visitWidgets(function(t, w) {
        log("  has widget of type '" + t + "': " + w);
        });
@@@ -565,9 -567,5 +568,9 @@@
        // raw pp2
        runAutoSearches();
      }
 +  };
 +  $(document).ready(function() {
 +    var widgetSelector = selectorForAllWidgets();
 +    if (widgetSelector && $(widgetSelector).length !== 0) init();
    });
  })(jQuery);