Compare commits

..

5 Commits

Author SHA1 Message Date
bootstraponline 86eda9bb10 Release 2.4.4 2012-11-30 17:28:53 -07:00
bootstraponline ca06aa9a6f Merge pull request #595 from jtietema/patch-1
Update lib/gollum/frontend/public/gollum/livepreview/js/livepreview.js
2012-11-30 16:11:47 -08:00
Jeroen Tietema ca57d9e83d Update lib/gollum/frontend/public/gollum/livepreview/js/livepreview.js
Adjusted the height of the preview window so that it doesn't flow 
offscreen. (It was impossible to read the last lines...)
2012-11-30 22:20:36 +01:00
bootstraponline 904f975f0c Fix comment 2012-11-30 00:02:24 -07:00
bootstraponline 9b9212cf4c Remove needless conversion
The fix for page.rb resolved UTF-8 in headers.
2012-11-30 00:00:28 -07:00
5 changed files with 6 additions and 10 deletions
+2 -2
View File
@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
s.required_ruby_version = ">= 1.8.7"
s.name = 'gollum'
s.version = '2.4.3'
s.date = '2012-11-29'
s.version = '2.4.4'
s.date = '2012-11-30'
s.rubyforge_project = 'gollum'
s.summary = "A simple, Git-powered wiki."
+1 -1
View File
@@ -29,7 +29,7 @@ require File.expand_path('../gollum/frontend/uri_encode_component', __FILE__)
$KCODE = 'U'
module Gollum
VERSION = '2.4.3'
VERSION = '2.4.4'
def self.assets_path
::File.expand_path('gollum/frontend/public', ::File.dirname(__FILE__))
@@ -464,7 +464,7 @@ var applyTimeout = function () {
// width -2 for scroll bar & -10 for left offset
var previewStyle = 'width:' + (widthHalf - 2 - 10) + 'px;' +
'height:' + height + 'px;' +
'height:' + (height -50) + 'px;' +
'left:' + (leftRight === false ? '10px;' : widthHalf + 'px;') +
// preview panel top is equal to height of comment tool panel (40px) + 1
'top:41px;';
+1 -5
View File
@@ -126,11 +126,7 @@ module Gollum
node.add_child(%Q{<a href="##{h_name}">#{h.content}</a>})
tail.add_child(node)
end
if toc != nil
# convert to HTML first before XHTML
toc = Nokogiri::HTML::fragment toc.to_s
toc = toc.to_xhtml(:encoding => 'UTF-8')
end
toc = toc.to_xml(@to_xml) if toc != nil
[doc, toc]
end
+1 -1
View File
@@ -58,7 +58,7 @@ context "Unicode Support" do
# href="#한글"
# href="#%ED%95%9C%EA%B8%80"
check_h1 '한글', '1'
# href="#한글"
# href="#Synhtèse"
# href="#Synht%C3%A8se"
check_h1 'Synhtèse', '2'
end