X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=dd106f7e181468b2deca058334f821f1e1491e72;hb=7969d3285f1c7b29c5f835044f0235691910a561;hp=6123235b103fc86ac3d8da77b45063b71524e269;hpb=f572e9a4431f1ec0da7e13e65f0806e8b242452a;p=mkws-moved-to-github.git diff --git a/src/mkws-core.js b/src/mkws-core.js index 6123235..dd106f7 100644 --- a/src/mkws-core.js +++ b/src/mkws-core.js @@ -95,6 +95,12 @@ var mkws = { } }; +// We may be using a separate copy +if (typeof(mkws_jQuery) !== "undefined") { + mkws.$ = mkws_jQuery; +} else { + mkws.$ = jQuery; +} mkws.log = function(string) { if (!mkws.log_level) @@ -266,6 +272,14 @@ mkws.defaultTemplate = function(name) { {{#if md-title-responsibility}}\ {{md-title-responsibility}}\ {{/if}}\ +{{#if md-date}}, {{md-date}}\ +{{#if location}}\ +, {{#mkws-first location}}{{mkws-attr "@name"}}{{/mkws-first}}\ +{{/if}}\ +{{#if md-medium}}\ +, {{md-medium}}\ +{{/if}}\ +{{/if}}\ '; } else if (name === "Image") { return '\ @@ -598,4 +612,4 @@ mkws.pagerNext = function(tname) { var widgetSelector = selectorForAllWidgets(); if (widgetSelector && $(widgetSelector).length !== 0) init(); }); -})(jQuery); +})(mkws.$);