1.1.3dev: merged [13328] from 1.0-stable (fix for #10470)

git-svn-id: http://trac.edgewall.org/intertrac/log:/trunk@13329 af82e41b-90c4-0310-8c96-b1721e28e2e2

Author: jomae

trac/htdocs/js/trac.js

@@ -140,6 +140,17 @@
   $.loadStyleSheet = function(href, type) {
     type = type || "text/css";
     $(document).ready(function() {
+      var link;
+      $("link[rel=stylesheet]").each(function() {
+        if (this.getAttribute("href") === href) {
+          if (this.disabled)
+            this.disabled = false;
+          link = this;
+          return false;
+        }
+      });
+      if (link !== undefined)
+        return;
       if (document.createStyleSheet) { // MSIE
         document.createStyleSheet(href);
       } else {

trac/ticket/templates/ticket.html

@@ -98,6 +98,8 @@
           var show_preview = preview.children().length != 0;
           $("#ticketchange").toggle(show_preview);
           setRevertHandler();
+          // Execute scripts to load stylesheets
+          items.filter("script").appendTo("head");
         }, "#ticketchange .trac-loading");
         $("#trac-comment-editor").autoSubmit({preview_comment: '1'}, function(data, reply) {
           var comment = $("#trac-comment-editor").next("div.comment").html(reply);

trac/ticket/templates/ticket_box.html

@@ -120,4 +120,5 @@ <h3 id="comment:description">
     </div>
     <br py:if="not ticket.description" style="clear: both" />
   </div>
+  <py:if test="chrome_info_script">${chrome_info_script(req)}</py:if>
 </div>

trac/ticket/templates/ticket_preview.html

@@ -17,7 +17,7 @@
       py:with="can_append = 'TICKET_APPEND' in perm(ticket.resource);
                has_edit_comment = 'TICKET_EDIT_COMMENT' in perm(ticket.resource);"
       py:strip="">
-  <xi:include href="ticket_box.html"/>
+  <xi:include href="ticket_box.html" py:with="chrome_info_script = None" />
   <div id="changelog">
     <div py:for="change in changes"
          class="change${' trac-new' if change.date > start_time and 'attachment' not in change.fields else None}"
@@ -28,4 +28,5 @@
   <input type="hidden" name="view_time" value="${to_utimestamp(ticket['changetime'])}"/>
   <div id="preview"><xi:include py:if="change_preview.fields or change_preview.comment"
                                 href="ticket_change.html" py:with="change = change_preview; preview = True"/></div>
+  <py:if test="chrome_info_script">${chrome_info_script(req)}</py:if>
 </html>

trac/ticket/web_ui.py

@@ -48,11 +48,12 @@
 from trac.util.presentation import separated
 from trac.util.translation import _, tag_, tagn_, N_, ngettext
 from trac.versioncontrol.diff import get_diff_options, diff_blocks
-from trac.web import IRequestHandler, arg_list_to_args, parse_arg_list
+from trac.web.api import IRequestHandler, arg_list_to_args, parse_arg_list
 from trac.web.chrome import (
     Chrome, INavigationContributor, ITemplateProvider,
     add_ctxtnav, add_link, add_notice, add_script, add_script_data,
-    add_stylesheet, add_warning, auth_link, prevnext_nav, web_context
+    add_stylesheet, add_warning, auth_link, chrome_info_script, prevnext_nav,
+    web_context
 )
 from trac.wiki.formatter import format_to, format_to_html, format_to_oneliner
 
@@ -500,6 +501,7 @@ def _process_newticket_request(self, req):
 
         if req.get_header('X-Requested-With') == 'XMLHttpRequest':
             data['preview_mode'] = True
+            data['chrome_info_script'] = chrome_info_script
             return 'ticket_box.html', data, None
 
         add_stylesheet(req, 'common/css/ticket.css')
@@ -519,7 +521,8 @@ def _process_ticket_request(self, req):
             escape_newlines = self.must_preserve_newlines
             rendered = format_to_html(self.env, context,
                                       req.args.get('edited_comment', ''),
-                                      escape_newlines=escape_newlines)
+                                      escape_newlines=escape_newlines) + \
+                       chrome_info_script(req)
             req.send(rendered.encode('utf-8'))
 
         req.perm('ticket', id, version).require('TICKET_VIEW')
@@ -641,6 +644,7 @@ def _process_ticket_request(self, req):
 
         if xhr:
             data['preview_mode'] = bool(data['change_preview']['fields'])
+            data['chrome_info_script'] = chrome_info_script
             return 'ticket_preview.html', data, None
 
         mime = Mimeview(self.env)

trac/web/chrome.py

@@ -52,7 +52,7 @@
 from trac.util.html import escape, plaintext
 from trac.util.text import pretty_size, obfuscate_email_address, \
                            shorten_line, unicode_quote_plus, to_unicode, \
-                           javascript_quote, exception_to_unicode
+                           javascript_quote, exception_to_unicode, to_js_string
 from trac.util.datefmt import (
     pretty_timedelta, format_datetime, format_date, format_time,
     from_utimestamp, http_date, utc, get_date_format_jquery_ui, is_24_hours,
@@ -304,6 +304,30 @@ def auth_link(req, link):
     return link
 
 
+def chrome_info_script(req, use_late=None):
+    """Get script elements from chrome info of the request object during
+    rendering template or after rendering.
+
+    :param      req: the HTTP request object.
+    :param use_late: if True, `late_links` will be used instead of `links`.
+    """
+    if use_late:
+        links = req.chrome.get('late_links')
+    else:
+        links = req.chrome.get('links')
+    if links:
+        links = links.get('stylesheet')
+
+    content = []
+    content.extend('jQuery.loadStyleSheet(%s, %s);' %
+                   (to_js_string(link['href']), to_js_string(link['type']))
+                   for link in links or ())
+    if content:
+        return tag.script('\n'.join(content), type='text/javascript')
+    else:
+        return ''
+
+
 def _chrome_resource_path(req, filename):
     """Get the path for a chrome resource given its `filename`.
 

trac/wiki/tests/__init__.py

@@ -17,7 +17,8 @@
 import trac.wiki.api
 import trac.wiki.formatter
 import trac.wiki.parser
-from trac.wiki.tests import formatter, macros, model, web_ui, wikisyntax
+from trac.wiki.tests import formatter, macros, model, web_api, web_ui, \
+                            wikisyntax
 from trac.wiki.tests.functional import functionalSuite
 
 def suite():
@@ -26,6 +27,7 @@ def suite():
     suite.addTest(formatter.suite())
     suite.addTest(macros.suite())
     suite.addTest(model.suite())
+    suite.addTest(web_api.suite())
     suite.addTest(web_ui.suite())
     suite.addTest(wikisyntax.suite())
     suite.addTest(doctest.DocTestSuite(trac.wiki.api))

trac/wiki/tests/web_api.py

@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2014 Edgewall Software
+# All rights reserved.
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution. The terms
+# are also available at http://trac.edgewall.org/wiki/TracLicense.
+#
+# This software consists of voluntary contributions made by many
+# individuals. For the exact contribution history, see the revision
+# history and logs, available at http://trac.edgewall.org/log/.
+
+import unittest
+from cStringIO import StringIO
+
+import trac.tests.compat
+from trac.mimeview.patch import PatchRenderer
+from trac.test import EnvironmentStub, Mock
+from trac.web.api import RequestDone
+from trac.web.href import Href
+from trac.wiki.web_api import WikiRenderer
+
+
+class WikiRendererTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.env = EnvironmentStub()
+        self.mod = WikiRenderer(self.env)
+
+    def test_load_stylesheet(self):
+        buf = StringIO()
+        def send(data):
+            buf.write(data)
+            raise RequestDone
+
+        text = """\
+{{{#!text/x-diff
+--- a/file.txt  2014-11-13 01:16:06 +0000
++++ b/file.txt  2014-11-13 01:16:06 +0000
+@@ -1 +1 @@
+-old line
++new line
+}}}
+"""
+        req = Mock(method='POST', path_info='/wiki_render', session={},
+                   args={'id': 'WikiStart', 'text': text},
+                   abs_href=Href('http://example.com/'), href=Href('/'),
+                   chrome={'links': {}, 'scripts': []}, perm=None,
+                   authname=None, tz=None, send=send)
+        self.assertTrue(self.mod.match_request(req))
+        try:
+            self.mod.process_request(req)
+            self.fail('RequestDone not raised')
+        except RequestDone:
+            output = buf.getvalue()
+            self.assertIn('<div class="code"><pre>', output)
+            self.assertIn('jQuery.loadStyleSheet("'
+                          '/chrome/common/css/diff.css"', output)
+
+
+def suite():
+    return unittest.makeSuite(WikiRendererTestCase)
+
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='suite')

trac/wiki/web_api.py

@@ -15,7 +15,7 @@
 from trac.resource import Resource
 from trac.util import as_int
 from trac.web.api import IRequestHandler
-from trac.web.chrome import web_context
+from trac.web.chrome import chrome_info_script, web_context
 from trac.wiki.formatter import format_to
 
 
@@ -51,5 +51,6 @@ def process_request(self, req):
 
         resource = Resource(realm, id=id, version=version)
         context = web_context(req, resource)
-        rendered = format_to(self.env, flavor, context, text, **options)
+        rendered = format_to(self.env, flavor, context, text, **options) + \
+                   chrome_info_script(req)
         req.send(rendered.encode('utf-8'))