Adam Gomaa  committed 1ad6855 Merge

merge in trunk changes

  • Participants
  • Parent commits f9c82d5, 23bd25a
  • Branches mongodb

Comments (0)

Files changed (1)

File trac/web/

         will not be made available this way and additional rewrite 
         rules will be needed in the web server.""")
+    jquery_location = Option('trac', 'jquery_location', '',
+        """Location of the jQuery !JavaScript library (version 1.5.1).
+        An empty value loads jQuery from the copy bundled with Trac.
+        Alternatively, jQuery could be loaded from a CDN, for example:
+ or
+        (''since 0.13'')""")
     metanav_order = ListOption('trac', 'metanav',
                                'login, logout, prefs, help, about', doc=
         """Order of the items to display in the `metanav` navigation bar,
         add_link(req, 'search',
         add_link(req, 'help','TracGuide'))
         add_stylesheet(req, 'common/css/trac.css')
-        add_script(req, 'common/js/jquery.js')
+        add_script(req, self.jquery_location or 'common/js/jquery.js')
         # Only activate noConflict mode if requested to by the handler
         if handler is not None and \
            getattr(handler.__class__, 'jquery_noconflict', False):