[dw-free] Backed out changeset 601b1915a5ba. Script tag in a script tag breaks the page.

[fu]

[commit: http://hg.dwscoalition.org/dw-free/rev/06753a526c76]

Backed out changeset 601b1915a5ba. Script tag in a script tag breaks the
page.

Files modified:

• cgi-bin/LJ/Talk.pm
• cgi-bin/weblib.pl

--------------------------------------------------------------------------------
diff -r 601b1915a5ba -r 06753a526c76 cgi-bin/LJ/Talk.pm
--- a/cgi-bin/LJ/Talk.pm	Mon Jul 05 15:47:29 2010 +0800
+++ b/cgi-bin/LJ/Talk.pm	Mon Jul 05 16:56:41 2010 +0800
@@ -1738,8 +1738,41 @@ sub talkform {
                                 ("", $BML::ML{'.opt.defpic'}, map { ($_, $_) } @pics));
 
         # userpic browse button
-        $ret .= LJ::Talk::js_iconbrowser_button()
-            if $remote && $remote->can_use_userpic_select;
+        $ret .= qq {
+            <input type="button" id="lj_userpicselect" value="Browse" />
+
+            <script type="text/javascript" language="JavaScript">
+            DOM.addEventListener(window, "load", function (evt) {
+                // attach userpicselect code to userpicbrowse button
+                var ups_btn = \$("lj_userpicselect");
+                if (ups_btn) {
+                    DOM.addEventListener(ups_btn, "click", function (evt) {
+                     var ups = new UserpicSelect();
+                     ups.init();
+                     ups.setPicSelectedCallback(function (picid, keywords) {
+                         var kws_dropdown = \$("prop_picture_keyword");
+
+                         if (kws_dropdown) {
+                             var items = kws_dropdown.options;
+
+                             // select the keyword in the dropdown
+                             keywords.forEach(function (kw) {
+                                 for (var i = 0; i < items.length; i++) {
+                                     var item = items[i];
+                                     if (item.value == kw) {
+                                         kws_dropdown.selectedIndex = i;
+                                         return;
+                                     }
+                                 }
+                             });
+                         }
+                     });
+                     ups.show();
+                 });
+                }
+            });
+            </script>
+        } if $remote && $remote->can_use_userpic_select;
                 
         $ret .= LJ::help_icon_html("userpics", " ");
     }
@@ -1921,45 +1954,6 @@ sub init_iconbrowser_js {
     );
 
     return @list;
-}
-
-# generate the javascript code for the icon browser
-sub js_iconbrowser_button {
-    return qq {
-        <input type="button" id="lj_userpicselect" value="Browse" />
-
-        <script type="text/javascript" language="JavaScript">
-        DOM.addEventListener(window, "load", function (evt) {
-            // attach userpicselect code to userpicbrowse button
-            var ups_btn = \$("lj_userpicselect");
-            if (ups_btn) {
-                DOM.addEventListener(ups_btn, "click", function (evt) {
-                 var ups = new UserpicSelect();
-                 ups.init();
-                 ups.setPicSelectedCallback(function (picid, keywords) {
-                     var kws_dropdown = \$("prop_picture_keyword");
-
-                     if (kws_dropdown) {
-                         var items = kws_dropdown.options;
-
-                         // select the keyword in the dropdown
-                         keywords.forEach(function (kw) {
-                             for (var i = 0; i < items.length; i++) {
-                                 var item = items[i];
-                                 if (item.value == kw) {
-                                     kws_dropdown.selectedIndex = i;
-                                     return;
-                                 }
-                             }
-                         });
-                     }
-                 });
-                 ups.show();
-             });
-            }
-        });
-        </script>
-    };
 }
 
 # generate the javascript code for the quick quote button
diff -r 601b1915a5ba -r 06753a526c76 cgi-bin/weblib.pl
--- a/cgi-bin/weblib.pl	Mon Jul 05 15:47:29 2010 +0800
+++ b/cgi-bin/weblib.pl	Mon Jul 05 16:56:41 2010 +0800
@@ -701,8 +701,9 @@ sub create_qr_div {
                                        ("", BML::ml('/talkpost.bml.opt.defpic'), map { ($_, $_) } @pics));
 
             # userpic browse button
-            $qrhtml .= LJ::Talk::js_iconbrowser_button()
-                if $remote->can_use_userpic_select;
+            $qrhtml .= qq {
+                <input type="button" id="lj_userpicselect" value="Browse" />
+                } if $remote->can_use_userpic_select;
 
             $qrhtml .= LJ::help_icon_html("userpics", " ");
         }
@@ -799,6 +800,40 @@ sub create_qr_div {
     $ret .= LJ::Talk::js_quote_button( 'body' );
 
     $ret .= "\n</script>";
+
+    $ret .= qq {
+        <script type="text/javascript" language="JavaScript">
+            DOM.addEventListener(window, "load", function (evt) {
+                // attach userpicselect code to userpicbrowse button
+                var ups_btn = \$("lj_userpicselect");
+                if (ups_btn) {
+                    DOM.addEventListener(ups_btn, "click", function (evt) {
+                     var ups = new UserpicSelect();
+                     ups.init();
+                     ups.setPicSelectedCallback(function (picid, keywords) {
+                         var kws_dropdown = \$("prop_picture_keyword");
+
+                         if (kws_dropdown) {
+                             var items = kws_dropdown.options;
+
+                             // select the keyword in the dropdown
+                             keywords.forEach(function (kw) {
+                                 for (var i = 0; i < items.length; i++) {
+                                     var item = items[i];
+                                     if (item.value == kw) {
+                                         kws_dropdown.selectedIndex = i;
+                                         return;
+                                     }
+                                 }
+                             });
+                         }
+                     });
+                     ups.show();
+                 });
+                }
+            });
+        </script>
+        } if $remote->can_use_userpic_select;
 
     return $ret;
 }
--------------------------------------------------------------------------------