Alexander Nazarov (nfokz) wrote in changelog,
Alexander Nazarov
nfokz
changelog

[livejournal] r22274: LJSUP-12345: Build a single ckeditor scr...

Committer: anazarov
LJSUP-12345: Build a single ckeditor script
U   trunk/cgi-bin/LJ/Widget/EntryForm.pm
U   trunk/htdocs/editjournal.bml
U   trunk/htdocs/js/ck/plugins/livejournal/plugin.js
U   trunk/htdocs/update.bml
Modified: trunk/cgi-bin/LJ/Widget/EntryForm.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/EntryForm.pm	2012-06-19 07:32:44 UTC (rev 22273)
+++ trunk/cgi-bin/LJ/Widget/EntryForm.pm	2012-06-19 08:10:44 UTC (rev 22274)
@@ -1869,6 +1869,7 @@
 
             'LJLike_name'             => 'ljlike.name',
             'LJLike_dialogText'       => 'ljlike.dialog.text',
+            'LJLike_button_repost'    => 'ljlike.button.repost',
             'LJLike_button_google'    => 'ljlike.button.google',
             'LJLike_button_facebook'  => 'ljlike.button.facebook',
             'LJLike_button_vkontakte' => 'ljlike.button.vkontakte',

Modified: trunk/htdocs/editjournal.bml
===================================================================
--- trunk/htdocs/editjournal.bml	2012-06-19 07:32:44 UTC (rev 22273)
+++ trunk/htdocs/editjournal.bml	2012-06-19 08:10:44 UTC (rev 22274)
@@ -585,14 +585,7 @@
             my $onload;
             $ret .= LJ::entry_form($entry, \$$head, \$onload, undef, \$js);
             $ret .= "</form></div>";
-            my $like_faq_link = LJ::help_icon_html('like', undef, undef, BML::ml('fcklang.ljlike.faq'));
-            $ret .= <<LIKE_FAQ;
-            <script type="text/javascript">
-            // <![CDATA[
-                window.faqLink = '$like_faq_link';
-            // ]]>
-            </script>
-LIKE_FAQ
+            LJ::need_var(faqLink => LJ::help_icon_html('like', undef, undef, BML::ml('fcklang.ljlike.faq')));
             $ret .= $js;
 
             $ret .= "</td>";

Modified: trunk/htdocs/js/ck/plugins/livejournal/plugin.js
===================================================================
--- trunk/htdocs/js/ck/plugins/livejournal/plugin.js	2012-06-19 07:32:44 UTC (rev 22273)
+++ trunk/htdocs/js/ck/plugins/livejournal/plugin.js	2012-06-19 08:10:44 UTC (rev 22274)
@@ -1129,7 +1129,7 @@
 					dialogContent += button.htmlOpt;
 				}
 
-				dialogContent += '</ul><p class="cke-dialog-likes-faq">' + window.faqLink + '</p></div>';
+				dialogContent += '</ul><p class="cke-dialog-likes-faq">' + Site.page.faqLink + '</p></div>';
 
 
 				CKEDITOR.dialog.add('LJLikeDialog', function() {

Modified: trunk/htdocs/update.bml
===================================================================
--- trunk/htdocs/update.bml	2012-06-19 07:32:44 UTC (rev 22273)
+++ trunk/htdocs/update.bml	2012-06-19 08:10:44 UTC (rev 22274)
@@ -391,14 +391,7 @@
         my $js = undef;
         $$body .= LJ::entry_form($entry, \$$head, $onload, $errors, \$js);
         $$body .= "</form><!-- end #updateForm -->\n";
-        my $like_faq_link = LJ::help_icon_html('like', undef, undef, BML::ml('fcklang.ljlike.faq'));
-        $$body .= <<LIKE_FAQ;
-        <script type="text/javascript">
-        // <![CDATA[
-            window.faqLink = '$like_faq_link';
-        // ]]>
-        </script>
-LIKE_FAQ
+        LJ::need_var(faqLink => LJ::help_icon_html('like', undef, undef, BML::ml('fcklang.ljlike.faq')));
         $$body .= $js;
         $$body .= LJ::Widget::SettingWindow->render;
 

Tags: anazarov, bml, js, livejournal, nfokz, pm
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