fix broken assets path

haru · Nov 16, 2024 · 2873923 · 2873923
1 parent 4b8a359
commit 2873923
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/app/views/wiki_extensions/_html_header.html.erb b/app/views/wiki_extensions/_html_header.html.erb
@@ -28,8 +28,8 @@
   <% end -%>
 
 
-  <%= javascript_include_tag(baseurl + "/plugin_assets/redmine_wiki_extensions/javascripts/jquery.tablesorter.js") %>
-  <%=  stylesheet_link_tag(baseurl + "/plugin_assets/redmine_wiki_extensions/stylesheets/wiki_extensions.css") %>
-  <%=  stylesheet_link_tag(baseurl + "/plugin_assets/redmine_wiki_extensions/stylesheets/wiki_extensions_print.css", :media => 'print') %>
-  <%= javascript_include_tag(baseurl + "/plugin_assets/redmine_wiki_extensions/javascripts/wiki_extensions.js") %>
+  <%= javascript_include_tag("jquery.tablesorter.js", plugin: "redmine_wiki_extensions") %>
+  <%=  stylesheet_link_tag("wiki_extensions.css", plugin: "redmine_wiki_extensions") %>
+  <%=  stylesheet_link_tag("wiki_extensions_print.css", plugin: "redmine_wiki_extensions", media: 'print') %>
+  <%= javascript_include_tag("wiki_extensions.js", plugin: "redmine_wiki_extensions") %>
 <% end %>
diff --git a/assets/javascripts/wiki_smiles.js b/assets/javascripts/wiki_smiles.js
@@ -64,7 +64,7 @@ jsTooltip.prototype = {
         this.a.className = 'smiles';
         this.img = document.createElement('img');
         this.img.title = 'Smiles';
-        this.img.src = redmine_base_url + '/plugin_assets/redmine_wiki_extensions/images/main_smile.png?dummy_param';
+        this.img.src = 'plugin_assets/redmine_wiki_extensions/images/main_smile.png?dummy_param';
         this.img.id = 'smiles_img';
         this.img.tabIndex = 200;
         this.a.appendChild(this.img);

diff --git a/lib/wiki_extensions_formatter_patch.rb b/lib/wiki_extensions_formatter_patch.rb
@@ -25,8 +25,7 @@ module WikiExtensionsFormatterPatch
   private
 
   def inline_smiles(text)
-    baseurl = Redmine::Utils.relative_url_root
-    src = baseurl + "/plugin_assets/redmine_wiki_extensions/images/"
+    src = "plugin_assets/redmine_wiki_extensions/images/"
 
     @emoticons = WikiExtensionsEmoticons::Emoticons.new
     @emoticons.emoticons.each{|emoticon|

diff --git a/lib/wiki_extensions_helper_patch.rb b/lib/wiki_extensions_helper_patch.rb
@@ -22,8 +22,7 @@ def heads_for_wiki_formatter
     super
     return if ie6_or_ie7?
     unless @heads_for_wiki_smiles_included
-      baseurl = Redmine::Utils.relative_url_root
-      imageurl = baseurl + "/plugin_assets/redmine_wiki_extensions/images"
+
       content_for :header_tags do
         # o = stylesheet_link_tag("wiki_smiles.css", :plugin => "redmine_wiki_extensions")
         # o << javascript_include_tag("wiki_smiles.js", :plugin => "redmine_wiki_extensions")