projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 9f5634a)
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
authorMike Taylor <mike@indexdata.com>
Fri, 25 Apr 2014 16:25:48 +0000 (17:25 +0100)
committerMike Taylor <mike@indexdata.com>
Fri, 25 Apr 2014 16:25:48 +0000 (17:25 +0100)
examples/htdocs/mkws-widget-reference.js [new file with mode: 0644] patch | blob
examples/htdocs/reference-universe.html [new file with mode: 0644] patch | blob
src/mkws-team.js patch | blob | history
src/mkws-widgets.js patch | blob | history

diff --git a/examples/htdocs/mkws-widget-reference.js b/examples/htdocs/mkws-widget-reference.js
new file mode 100644 (file)
index 0000000..71f91ea
--- /dev/null
+++ b/examples/htdocs/mkws-widget-reference.js
@@ -0,0 +1,26 @@
+mkws.registerWidgetType('Reference', function() {
+    mkws.promotionFunction('Record').call(this);
+    if (!this.config.target) this.config.target = 'wikimedia_wikipedia_single_result';
+    if (!this.config.template) this.config.template = 'Reference';
+
+    this.team.registerTemplate('Reference', '\
+<a href="{{md-electronic-url}}">\
+  <h1>{{md-title}}</h1>\
+</a>\
+{{#if md-title-remainder}}\
+  <b>{{md-title-remainder}}</b>\
+{{/if}}\
+{{#if md-title-responsibility}}\
+  <i>{{md-title-responsibility}}</i>\
+{{/if}}\
+  <p>\
+    <img style="float:right; margin: 0 0 1em 3em" src="{{md-thumburl}}" alt="{{md-title}}">\
+    {{md-description}}\
+  </p>\
+');
+
+    var that = this;
+    this.team.queue("record").subscribe(function(data) {
+        that.log("got data " + $.toJSON(data));
+    });
+});
diff --git a/examples/htdocs/reference-universe.html b/examples/htdocs/reference-universe.html
new file mode 100644 (file)
index 0000000..b2c148e
--- /dev/null
+++ b/examples/htdocs/reference-universe.html
@@ -0,0 +1,15 @@
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>MKWS demo: Reference Universe widget</title>
+    <link rel="stylesheet" type="text/css" href="//mkws.indexdata.com/mkws.css" />
+    <script type="text/javascript">
+      var mkws_config = { service_proxy_auth: "//mkws.indexdata.com/service-proxy-testauth" };
+    </script>
+    <script type="text/javascript" src="//mkws.indexdata.com/mkws-complete.js"></script>
+    <script type="text/javascript" src="mkws-widget-reference.js"></script>
+  </head>
+  <body>
+    <div class='mkwsReference' autosearch='!param!q'>result will appear here</div>
+  </body>
+</html>
diff --git a/src/mkws-team.js b/src/mkws-team.js
index a76c65c..cf4794b 100644 (file)
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -26,7 +26,8 @@ function team($, teamName) {
        "last": $.now()
     };
     var m_paz; // will be initialised below
-    var m_template = {};
+    var m_tempateText = {}; // widgets can register tempates to be compiled
+    var m_template = {}; // compiled templates, from any source
     var m_config = mkws.objectInheritingFrom(mkws.config);
     var m_widgets = {}; // Maps widget-type to object
 
@@ -616,6 +617,11 @@ function team($, teamName) {
     that.renderDetails = renderDetails;
 
 
+    that.registerTemplate = function(name, text) {
+        m_tempateText[name] = text;
+    };
+
+
     function loadTemplate(name) {
        var template = m_template[name];
 
@@ -631,6 +637,9 @@ function team($, teamName) {
             }
 
            if (!source) {
+                source = m_tempateText[name];
+            }
+           if (!source) {
                source = defaultTemplate(name);
            }
 
diff --git a/src/mkws-widgets.js b/src/mkws-widgets.js
index cd9e45d..517850b 100644 (file)
--- a/src/mkws-widgets.js
+++ b/src/mkws-widgets.js
@@ -237,6 +237,7 @@ mkws.registerWidgetType('Records', function() {
        var html = [];
        for (var i = 0; i < data.hits.length; i++) {
            var hit = data.hits[i];
+            that.team.queue("record").publish(hit);
            var divId = team.recordElementId(hit.recid[0]);
            html.push('<div class="record mkwsTeam_' + team.name() + ' ' + divId + '">', renderSummary(hit), '</div>');
            // ### At some point, we may be able to move the
MasterKey Widget Set