Merge branch '5.x' into critic_markup_styling

2018-11-12 16:39:45 +01:00
parent 6d0b42b18f b5c4fdcc83
commit 5de2442540
14 changed files with 103 additions and 59 deletions
@@ -15,12 +15,17 @@
  <![endif]-->

  <script>
-      var baseUrl = '{{base_url}}';
-      var uploadDest   = '{{upload_dest}}';
-      {{#page}}
-      var pageFullPath = '{{url_path}}';
-      {{/page}}
-      var criticMarkup = '{{critic_markup}}';
+  var criticMarkup = '{{critic_markup}}';
+	var baseUrl = '{{base_url}}';
+	var uploadDest = 'uploads';
+	var perPageUploads = '{{per_page_uploads}}';
+	if (perPageUploads == 'true') {
+	  uploadDest = uploadDest + window.location.pathname.replace(/.*gollum\/[-\w]+\//, "/").replace(/\.[^/.]+$/, "")
+	}
+	{{#page}}
+	  var pageFullPath = '{{url_path}}';
+	{{/page}}
+
  </script>
  {{#sprockets_javascript_tag}}app{{/sprockets_javascript_tag}}
  {{#use_identicon}}