From: Jason Skomorowski <jason@indexdata.com>
Date: Tue, 24 Jun 2014 15:36:32 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~479
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=007617c27763d9407ca64bc39be52c7a29c63ea2;hp=9414c1ffb05c80a52d0ab39ee13889276c5a5a04;p=mkws-moved-to-github.git

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

diff --git a/src/Makefile b/src/Makefile
index 82cf254..86ebb77 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -46,6 +46,7 @@ mkws-js mkws-complete.js: Makefile mkws.js mkws-jquery.js ${HANDLEBARS_FILE} ${J
 	  echo "*/"; \
 	  cat ${JQUERY_FILE}; \
 	  cat ${JQUERY_JSON_FILE}; \
+	  echo 'mkws_jQuery = $.noConflict();'; \
 	  cat ${HANDLEBARS_FILE}; \
 	  cat ${PP2_FILE}; \
 	  cat  mkws.js; \
diff --git a/src/mkws-core.js b/src/mkws-core.js
index de5895d..4ba963c 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -95,6 +95,9 @@ var mkws = {
   }
 };
 
+// We may be using a separate copy
+if (!mkws_jQuery) mkws_jQuery = jQuery;
+mkws.$ = mkws_jQuery;
 
 mkws.log = function(string) {
   if (!mkws.log_level)
@@ -606,4 +609,4 @@ mkws.pagerNext = function(tname) {
     var widgetSelector = selectorForAllWidgets();
     if (widgetSelector && $(widgetSelector).length !== 0) init();
   });
-})(jQuery);
+})(mkws_jQuery);