projects / mkws-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 63cd167)
support multiple popup widgets, part of MKWS-235
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 10 Jul 2014 10:30:01 +0000 (10:30 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 10 Jul 2014 10:30:01 +0000 (10:30 +0000)
examples/htdocs/popup.html patch | blob | history
src/mkws-popup.js patch | blob | history

diff --git a/examples/htdocs/popup.html b/examples/htdocs/popup.html
index 18a2d8c..fd96eb5 100644 (file)
--- a/examples/htdocs/popup.html
+++ b/examples/htdocs/popup.html
@@ -1,20 +1,20 @@
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>MKWS demo: Reference Universe widget with popup window</title>
+    <title>MKWS demo: Reference widget with popup window</title>
     <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
     <link rel="stylesheet" type="text/css" href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
     <link rel="stylesheet" type="text/css" href="mkws-widget-reference.css" />
-    <link rel="stylesheet" type="text/css" href="mkws-widget-ru.css" />
+    <link rel="stylesheet" type="text/css" href="mkws-widget-credo.css" />
 
     <script type="text/javascript">
       var mkws_config = {
-         service_proxy_auth: "//mkws.indexdata.com/service-proxy-testauth"
+         service_proxy_auth: "//mkws.indexdata.com/service-proxy-credoauth"
       };
     </script>
 
     <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
-    <script src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
+    <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
 
     <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
     <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
@@ -35,10 +35,27 @@
     <script type="text/javascript" src="src/mkws-widget-reference.js"></script>
     <script type="text/javascript" src="src/mkws-widget-builder.js"></script>
 
-    <script type="text/javascript" src="mkws-widget-ru.js"></script>
+    <script type="text/javascript" src="mkws-widget-credo.js"></script>
   </head>
   <body>
-    <div class='mkwsReferenceUniverse PopupWindow' popup_width="400" popup_height="400" popup_autoOpen="1" autosearch='berlin' sentences='1'>Reference Universe result will appear here</div>
-    <div class='mkwsReference PopupWindow' popup_width="800" popup_height="400" popup_autoOpen="1" autosearch='sushi' sentences='1'>Reference result will appear here</div
+    <h3>MKWS widgets in a popup window</h3>
+
+    <div class="mkwsCredo PopupWindow" popup_width="900" popup_height="700" popup_autoOpen="1" autosearch="!param!q">
+      mkwsCredo result will appear here
+    </div>
+
+    <div class="mkwsReference PopupWindow" popup_width="800" popup_height="500" popup_autoOpen="1" sentences="1" autosearch="!param!q">
+      mkwsReference result will appear here
+    </div>
+
+    <div class="PopupWindow" popup_width="1024" popup_height="650" popup_modal="0" popup_autoOpen="1">
+      <div class="mkwsSwitch"></div>
+      <div class="mkwsSearch"></div>
+      <div class="mkwsLang"></div>
+      <div class="mkwsResults"></div>
+      <div class="mkwsTargets"></div>
+      <div class="mkwsStat"></div>
+    </div
+
   </body>
 </html>
diff --git a/src/mkws-popup.js b/src/mkws-popup.js
index f5b0550..48b5059 100644 (file)
--- a/src/mkws-popup.js
+++ b/src/mkws-popup.js
@@ -3,7 +3,6 @@
  */
 
 // "use strict";
-
 $(document).ready(function () {
     // mkws.registerWidgetType('PopupWindow', function() {
     var $ = mkws.$;
@@ -15,30 +14,33 @@ $(document).ready(function () {
         return;
     }
 
-    var popup = $(".PopupWindow");
-    if (!popup) {
-        debug("no popup found");
+    var popup_window = $(".PopupWindow");
+    if (!popup_window) {
+        debug("no popup found, skip");
         return;
     } else {
-        debug("found popup windows: " + popup.length);
+        debug("found popup windows: " + popup_window.length);
     }
 
-    $(popup).each(function (i) {
-        var width = parseInt(this.attr("popup_width") || "800");
-        var height = parseInt(this.attr("popup_height") || "600");
-        var autoOpen = parseInt(this.attr("popup_autoOpen") || "0");
+    popup_window.each(function (i) {
+        var that = $(this);
+
+        var width = parseInt(that.attr("popup_width") || "800");
+        var height = parseInt(that.attr("popup_height") || "600");
+        var autoOpen = parseInt(that.attr("popup_autoOpen") || "0");
+        var modal = parseInt(that.attr("popup_modal") || "0");
 
         debug("Popup parameters: width: " + width + ", height: " + height + ", autoOpen: " + autoOpen);
-        $(this).dialog({
+        that.dialog({
             closeOnEscape: true,
             autoOpen: autoOpen,
             height: height,
             width: width,
-            modal: true,
+            modal: modal ? true : false,
             resizable: true,
             buttons: {
                 Cancel: function () {
-                    $(this).dialog("close");
+                    that.dialog("close");
                 }
             },
             close: function () {}
MasterKey Widget Set