jro_apps/redmine Commit - r5118:70d765e906a5

Moves jstoolbar script include tags to head....

Jean-Philippe Lang -

r5118:70d765e906a5

parent child

Context file:

r5118:70d765e906a5

Collapse all files

lib/redmine/wiki_formatting/textile/helper.rb +5 -4

             # Redmine - project management software
             # Copyright (C) 2006-2008  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module Redmine
               module WikiFormatting
                 module Textile
                   module Helper
                     def wikitoolbar_for(field_id)
                       # Is there a simple way to link to a public resource?
                       url = "#{Redmine::Utils.relative_url_root}/help/wiki_syntax.html"
                       help_link = l(:setting_text_formatting) + ': ' +
                         link_to(l(:label_help), url,
                                 :onclick => "window.open(\"#{ url }\", \"\", \"resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes\"); return false;")
-                      javascript_include_tag('jstoolbar/jstoolbar') +
-                        javascript_include_tag('jstoolbar/textile') +
-                        javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language.to_s.downcase}") +
                       javascript_tag("var wikiToolbar = new jsToolBar($('#{field_id}')); wikiToolbar.setHelpLink('#{help_link}'); wikiToolbar.draw();")
                     end
                     def initial_page_content(page)
                       "h1. #{@page.pretty_title}"
                     end
                     def heads_for_wiki_formatter
-                      stylesheet_link_tag 'jstoolbar'
+                      @@heads_for_wiki_formatter ||=
+                        javascript_include_tag('jstoolbar/jstoolbar') +
+                        javascript_include_tag('jstoolbar/textile') +
+                        javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language.to_s.downcase}") +
+                        stylesheet_link_tag('jstoolbar')
                     end
                   end
                 end
               end
             end

test/integration/layout_test.rb +9 0

             require File.expand_path('../../test_helper', __FILE__)
             class LayoutTest < ActionController::IntegrationTest
               fixtures :all
               test "browsing to a missing page should render the base layout" do
                 get "/users/100000000"
                 assert_response :not_found
                 # UsersController uses the admin layout by default
                 assert_select "#admin-menu", :count => 0
               end
               test "browsing to an unauthorized page should render the base layout" do
                 change_user_password('miscuser9', 'test')
                 log_user('miscuser9','test')
                 get "/admin"
                 assert_response :forbidden
                 assert_select "#admin-menu", :count => 0
               end
               def test_top_menu_and_search_not_visible_when_login_required
                 with_settings :login_required => '1' do
                   get '/'
                   assert_select "#top-menu > ul", 0
                   assert_select "#quick-search", 0
                 end
               end
               def test_top_menu_and_search_visible_when_login_not_required
                 with_settings :login_required => '0' do
                   get '/'
                   assert_select "#top-menu > ul"
                   assert_select "#quick-search"
                 end
               end
+              def test_wiki_formatter_header_tags
+                Role.anonymous.add_permission! :add_issues
+                get '/projects/ecookbook/issues/new'
+                assert_tag :script,
+                  :attributes => {:src => %r{^/javascripts/jstoolbar/textile.js}},
+                  :parent => {:tag => 'head'}
+              end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages