From d2ea03fbb970dd23385e5a7e7a1853a330df8302 Mon Sep 17 00:00:00 2001
From: Dawa Ometto <dawa.ometto@phil.uu.nl>
Date: Sat, 20 Oct 2018 00:24:15 +0200
Subject: [PATCH] Use path helpers consistently

---
 .../public/gollum/javascript/editor/gollum.editor.js.erb      | 4 ++--
 .../javascript/{gollum.dialog.js => gollum.dialog.js.erb}     | 2 +-
 lib/gollum/views/helpers.rb                                   | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename lib/gollum/public/gollum/javascript/{gollum.dialog.js => gollum.dialog.js.erb} (99%)

diff --git a/lib/gollum/public/gollum/javascript/editor/gollum.editor.js.erb b/lib/gollum/public/gollum/javascript/editor/gollum.editor.js.erb
index ad46f548..c187977e 100755
--- a/lib/gollum/public/gollum/javascript/editor/gollum.editor.js.erb
+++ b/lib/gollum/public/gollum/javascript/editor/gollum.editor.js.erb
@@ -151,7 +151,7 @@
           // get form fields
           var oldAction = $('#gollum-editor form').attr('action');
           var $form = $($('#gollum-editor form').get(0));
-          $form.attr('action', this.href || '/preview');
+          $form.attr('action', this.href || '<%= preview_path >');
           $form.attr('target', '_blank');
           var paths = window.location.pathname.split('/');
           $form.attr('page', paths[ paths.length - 1 ] || '')
@@ -429,7 +429,7 @@
       }
 
       // attempt to load the definition for this language
-      var script_uri = baseUrl + '/assets/editor/langs/' + markup_name + '.js';
+      var script_uri = '<%= assets_path %>/editor/langs/' + markup_name + '.js';
       $.ajax({
                 url: script_uri,
                 dataType: 'script',
diff --git a/lib/gollum/public/gollum/javascript/gollum.dialog.js b/lib/gollum/public/gollum/javascript/gollum.dialog.js.erb
similarity index 99%
rename from lib/gollum/public/gollum/javascript/gollum.dialog.js
rename to lib/gollum/public/gollum/javascript/gollum.dialog.js.erb
index c7dcba0f..cd9a43c3 100755
--- a/lib/gollum/public/gollum/javascript/gollum.dialog.js
+++ b/lib/gollum/public/gollum/javascript/gollum.dialog.js.erb
@@ -101,7 +101,7 @@
 
       var id = fieldAttributes.id || 'upload';
       var name = fieldAttributes.name || 'file';
-      var action = fieldAttributes.action || '/upload_file';
+      var action = fieldAttributes.action || '<%= upload_file_path %>';
 
       html += '<form method=post enctype="multipart/form-data" ' +
         'action="' + action + '" ' + 'id="' + id + '">';
diff --git a/lib/gollum/views/helpers.rb b/lib/gollum/views/helpers.rb
index 223b4381..47e0af91 100644
--- a/lib/gollum/views/helpers.rb
+++ b/lib/gollum/views/helpers.rb
@@ -4,6 +4,7 @@ module Precious
   module Views
     module RouteHelpers
       ROUTES = {
+        assets: 'assets',
         'gollum' => {
           last_commit_info: 'last_commit_info',
           latest_changes: 'latest_changes',