glossary MDL-23369 made glossary item autolink filter popups the righ…

…t size
yousuftafhim · Jul 22, 2010 · aa28106 · aa28106
1 parent f954e12
commit aa28106
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/javascript-static.js b/lib/javascript-static.js
@@ -1554,6 +1554,14 @@ function old_onload_focus(formid, controlname) {
 }
 
 function build_querystring(obj) {
+    return convert_object_to_string(obj, '&');
+}
+
+function build_windowoptionsstring(obj) {
+    return convert_object_to_string(obj, ',');
+}
+
+function convert_object_to_string(obj, separator) {
     if (typeof obj !== 'object') {
         return null;
     }
@@ -1569,7 +1577,7 @@ function build_querystring(obj) {
             list.push(k+'='+encodeURIComponent(value));
         }
     }
-    return list.join('&');
+    return list.join(separator);
 }
 
 function stripHTML(str) {

diff --git a/mod/glossary/yui/autolinker/autolinker.js b/mod/glossary/yui/autolinker/autolinker.js
@@ -29,7 +29,7 @@ YUI.add('moodle-mod_glossary-autolinker', function(Y) {
                 openpopup(e, {
                     url : this.getAttribute('href')+'&popup=1',
                     name : popupname,
-                    options : build_querystring(popupoptions)
+                    options : build_windowoptionsstring(popupoptions)
                 })
             }, Y.one(document.body), 'a.glossary.autolink');
         }