Палсеич— (lusever) wrote in changelog,
Палсеич—
lusever
changelog

[livejournal] r17390: LJSV-982: Paste Media button does not ap...

Committer: pkornilov
LJSV-982: Paste Media button does not appear in Insert Image dialog in Safari and Chrome.
LJSV-1109: Photobucket tab in Insert Images dialog is blank.
U   trunk/htdocs/imgupload.bml
U   trunk/htdocs/imguploadrte.bml
U   trunk/htdocs/js/entry.js
Modified: trunk/htdocs/imgupload.bml
===================================================================
--- trunk/htdocs/imgupload.bml	2010-09-16 07:21:25 UTC (rev 17389)
+++ trunk/htdocs/imgupload.bml	2010-09-16 08:00:02 UTC (rev 17390)
@@ -86,9 +86,9 @@
 
     # content
     my $ml_unavailable = LJ::Lang::ml('/imgupload.bml.msg.unavailable');
-    $ret .= "<div class='insobjContent' id='img_iframe_holder' style='display: none; margin: 0px 0px 0px 0px;'>
-        $ml_unavailable
-    </div><div id='img_fromwhere' class='insobjContent'>";
+    $ret .= "<div class='insobjContent' id='img_iframe_holder' style='display: none; margin: 0px 0px 0px 0px;'>";
+    # $ml_unavailable
+    $ret .= "</div><div id='img_fromwhere' class='insobjContent'>";
 
     $ret .= "<p class='wintitle' id='wintitle'></p>";
 

Modified: trunk/htdocs/imguploadrte.bml
===================================================================
--- trunk/htdocs/imguploadrte.bml	2010-09-16 07:21:25 UTC (rev 17389)
+++ trunk/htdocs/imguploadrte.bml	2010-09-16 08:00:02 UTC (rev 17390)
@@ -11,8 +11,7 @@
     my $u = LJ::User->remote;
 
     LJ::need_res("stc/display_none.css",
-                 "js/photobucket_jw.js",
-                 "js/browserdetect.js");
+                 "js/photobucket_jw.js");
     my $js = "";
     if ($GET{upload_count} || LJ::did_post()) {
 
@@ -255,14 +254,10 @@
                 </div>
                 <div id="divPhotobucket" style="DISPLAY: none">
                 <script type="text/javascript">
-                    // Safari can't use the advanced JWidget integration so the callback
-                    // URL is set to nothing
                     var cb_url = "&url=" + escape(seedurl);
                     var inRTE = true;
-                    var browser = new BrowserDetectLite();
-                    if (browser.isSafari) cb_url = '';
-                    document.write('$ml_unavailable');
-                    //document.write('<iframe name="jwidget" id="jwidget" src="http://photobucket.com/svc/jwidget.php?width=360&height=400&largeThumb=true&pbaffsite='+pb_affsite_id+'&bg=%23F7F7F7&border=false&bordercolor=%23000000'+cb_url+'&linkType=url&textcolor=%23000000&linkcolor=%230000FF&media=image&btntxt=Paste&dimensions=false&promo=false" bgcolor="transparent" width="99%" height="440" frameborder="0" scrolling="no"></iframe>');
+                    //document.write('$ml_unavailable');
+                    document.write('<iframe name="jwidget" id="jwidget" src="http://photobucket.com/svc/jwidget.php?width=360&height=400&largeThumb=true&pbaffsite='+pb_affsite_id+'&bg=%23F7F7F7&border=false&bordercolor=%23000000'+cb_url+'&linkType=url&textcolor=%23000000&linkcolor=%230000FF&media=image&btntxt=Paste&dimensions=false&promo=false" bgcolor="transparent" width="99%" height="440" frameborder="0" scrolling="no"></iframe>');
                 </script>
                 </div>
             };

Modified: trunk/htdocs/js/entry.js
===================================================================
--- trunk/htdocs/js/entry.js	2010-09-16 07:21:25 UTC (rev 17389)
+++ trunk/htdocs/js/entry.js	2010-09-16 08:00:02 UTC (rev 17390)
@@ -1099,11 +1099,7 @@
     div_fw.style.display = "none";
     div_if.style.display = "block";
 
-    // Safari can't use the advanced JWidget integration so the callback
-    // URL is set to nothing
     var cb_url = "&url=" + escape(seedurl);
-    var browser = new BrowserDetectLite();
-    if (browser.isSafari) cb_url = '';
 
     div_if.innerHTML = '<iframe name="jwidget" id="jwidget" src="http://photobucket.com/svc/jwidget.php?width=360&height=400&largeThumb=true&pbaffsite='+pb_affsite_id+'&bg=%23FFFFFF&border=false&bordercolor=%23000000'+cb_url+'&linkType=url&textcolor=%23000000&linkcolor=%230000FF&media=image&btntxt=Paste&dimensions=false&promo=false" bgcolor="transparent" width="99%" height="440" frameborder="0" scrolling="no"></iframe>';
     InOb.setPreviousCb(InOb.showSelectorPage);

Tags: bml, js, livejournal, lusever
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments