Fix mathjax on edit and create pages (#1773)
* Fix mathjax on edit and create pages
This commit is contained in:
+2
-2
@@ -20,6 +20,7 @@ require 'gollum/views/layout'
|
||||
require 'gollum/views/editable'
|
||||
require 'gollum/views/has_page'
|
||||
require 'gollum/views/has_user_icons'
|
||||
require 'gollum/views/has_math'
|
||||
require 'gollum/views/pagination'
|
||||
require 'gollum/views/rss.rb'
|
||||
require 'gollum/views/template_cascade'
|
||||
@@ -125,6 +126,7 @@ module Precious
|
||||
@css = settings.wiki_options[:css]
|
||||
@js = settings.wiki_options[:js]
|
||||
@mathjax_config = settings.wiki_options[:mathjax_config]
|
||||
@mathjax = settings.wiki_options[:mathjax]
|
||||
|
||||
@use_static_assets = settings.wiki_options.fetch(:static, settings.environment != :development)
|
||||
@static_assets_path = settings.wiki_options.fetch(:static_assets_path, ::File.join(File.dirname(__FILE__), 'public/assets'))
|
||||
@@ -217,7 +219,6 @@ module Precious
|
||||
if page = wikip.page
|
||||
@page = page
|
||||
@content = page.text_data
|
||||
@mathjax = wiki.mathjax
|
||||
@etag = page.sha
|
||||
mustache :edit
|
||||
else
|
||||
@@ -613,7 +614,6 @@ module Precious
|
||||
# Extensions and layout data
|
||||
@editable = true
|
||||
@toc_content = wiki.universal_toc ? @page.toc_data : nil
|
||||
@mathjax = wiki.mathjax
|
||||
@h1_title = wiki.h1_title
|
||||
@bar_side = wiki.bar_side
|
||||
@allow_uploads = wiki.allow_uploads
|
||||
|
||||
@@ -2,6 +2,7 @@ module Precious
|
||||
module Views
|
||||
class Create < Layout
|
||||
include Editable
|
||||
include HasMath
|
||||
|
||||
attr_reader :page, :name
|
||||
|
||||
@@ -41,9 +42,9 @@ module Precious
|
||||
def content
|
||||
@template_page
|
||||
end
|
||||
|
||||
|
||||
private
|
||||
|
||||
|
||||
def find_format
|
||||
@found_format ||= (Gollum::Page.format_for("#{@name}#{@ext}") || default_markup)
|
||||
end
|
||||
|
||||
@@ -3,6 +3,7 @@ module Precious
|
||||
class Edit < Layout
|
||||
include Editable
|
||||
include HasPage
|
||||
include HasMath
|
||||
|
||||
attr_reader :page, :content
|
||||
|
||||
@@ -18,10 +19,6 @@ module Precious
|
||||
def page_name
|
||||
@name
|
||||
end
|
||||
|
||||
def mathjax
|
||||
@mathjax
|
||||
end
|
||||
|
||||
def header
|
||||
if @header.nil?
|
||||
@@ -67,7 +64,7 @@ module Precious
|
||||
def etag
|
||||
@etag
|
||||
end
|
||||
|
||||
|
||||
def allow_uploads
|
||||
@allow_uploads
|
||||
end
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
module Precious
|
||||
module HasMath
|
||||
def mathjax
|
||||
@mathjax
|
||||
end
|
||||
|
||||
def mathjax_config
|
||||
@mathjax_config
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -2,9 +2,10 @@ module Precious
|
||||
module Views
|
||||
class Page < Layout
|
||||
include HasPage
|
||||
include HasMath
|
||||
|
||||
attr_reader :content, :page, :header, :footer, :preview, :historical
|
||||
|
||||
|
||||
VALID_COUNTER_STYLES = ['decimal', 'decimal-leading-zero', 'arabic-indic', 'armenian', 'upper-armenian',
|
||||
'lower-armenian', 'bengali', 'cambodian', 'khmer', 'cjk-decimal', 'devanagari', 'georgian', 'gujarati', 'gurmukhi',
|
||||
'hebrew', 'kannada', 'lao', 'malayalam', 'mongolian', 'myanmar', 'oriya', 'persian', 'lower-roman', 'upper-roman',
|
||||
@@ -61,11 +62,11 @@ module Precious
|
||||
def editable
|
||||
@editable
|
||||
end
|
||||
|
||||
|
||||
def search
|
||||
true
|
||||
end
|
||||
|
||||
|
||||
def history
|
||||
true
|
||||
end
|
||||
@@ -73,11 +74,11 @@ module Precious
|
||||
def latest_changes
|
||||
true
|
||||
end
|
||||
|
||||
|
||||
def overview
|
||||
true
|
||||
true
|
||||
end
|
||||
|
||||
|
||||
def allow_editing
|
||||
@allow_editing
|
||||
end
|
||||
@@ -157,14 +158,6 @@ module Precious
|
||||
@toc_content
|
||||
end
|
||||
|
||||
def mathjax
|
||||
@mathjax
|
||||
end
|
||||
|
||||
def mathjax_config
|
||||
@mathjax_config
|
||||
end
|
||||
|
||||
def use_identicon
|
||||
@page.wiki.user_icons == 'identicon'
|
||||
end
|
||||
@@ -182,7 +175,7 @@ module Precious
|
||||
# Returns Hash.
|
||||
def metadata
|
||||
@page.metadata
|
||||
end
|
||||
end
|
||||
|
||||
# Access to embedded metadata.
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user