projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
[mkws-moved-to-github.git]
/
src
/
mkws-core.js
diff --git
a/src/mkws-core.js
b/src/mkws-core.js
index
6123235
..
4ba963c
100644
(file)
--- 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)
mkws.log = function(string) {
if (!mkws.log_level)
@@
-266,6
+269,14
@@
mkws.defaultTemplate = function(name) {
{{#if md-title-responsibility}}\
<span><i>{{md-title-responsibility}}</i></span>\
{{/if}}\
{{#if md-title-responsibility}}\
<span><i>{{md-title-responsibility}}</i></span>\
{{/if}}\
+{{#if md-date}}, {{md-date}}\
+{{#if location}}\
+, {{#mkws-first location}}{{mkws-attr "@name"}}{{/mkws-first}}\
+{{/if}}\
+{{#if md-medium}}\
+<span>, {{md-medium}}</span>\
+{{/if}}\
+{{/if}}\
';
} else if (name === "Image") {
return '\
';
} else if (name === "Image") {
return '\
@@
-598,4
+609,4
@@
mkws.pagerNext = function(tname) {
var widgetSelector = selectorForAllWidgets();
if (widgetSelector && $(widgetSelector).length !== 0) init();
});
var widgetSelector = selectorForAllWidgets();
if (widgetSelector && $(widgetSelector).length !== 0) init();
});
-})(jQuery);
+})(mkws_jQuery);