diff --git a/CHANGELOG b/CHANGELOG index 17db3170..a4a9f4d4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,27 @@ N.B.: You *must* run after installing the new software, to enjoy the benefits of this new version. +------------------------------------------------------------------------------ +* 0.19 + +New Features: + +* WYSIWYG SVG editing (via SVG-edit) +* One-click S5 templates + +Bugs Fixed: + +* Allow special characters ('.', '/', etc) in page names. +* Fix BlahTeX/PNG path, so equations render in diff and + previous revision pages. +* Fix HTML Export feature so that o uploaded files are + included, stylesheets load, etc. +* Uploaded files inclided in Markup Export. +* Fix Print View, so that uploaded images work. +* Fix some more Ruby 1.9 isues. +* Prevent page from being renamed to null. +* Fix Migration to work under PostgreSQL (from J. Zellman). + ------------------------------------------------------------------------------ * 0.18.1 diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d133a9f2..3ddaabbb 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -270,10 +270,10 @@ end module Instiki module VERSION #:nodoc: MAJOR = 0 - MINOR = 18 - TINY = 1 + MINOR = 19 + TINY = 0 SUFFIX = '(MML+)' - PRERELEASE = false + PRERELEASE = 'pre' if PRERELEASE STRING = [MAJOR, MINOR].join('.') + PRERELEASE + SUFFIX else diff --git a/public/javascripts/page_helper.js b/public/javascripts/page_helper.js index ceb8f08d..53efdc73 100644 --- a/public/javascripts/page_helper.js +++ b/public/javascripts/page_helper.js @@ -91,6 +91,7 @@ function setupSVGedit(path){ window.close(); } }); + editor.svgCanvas.randomizeIds(); editor.svgCanvas.setSvgString(selected); }, true); } else { @@ -101,6 +102,7 @@ function setupSVGedit(path){ window.close(); } }); + editor.svgCanvas.randomizeIds(); }, true); } SVGeditButton.disabled = true; diff --git a/public/svg-edit/editor/extensions/ext-arrows.js b/public/svg-edit/editor/extensions/ext-arrows.js index 0c10ff57..445c186c 100644 --- a/public/svg-edit/editor/extensions/ext-arrows.js +++ b/public/svg-edit/editor/extensions/ext-arrows.js @@ -13,9 +13,11 @@ $(function() { var svgcontent = S.svgcontent, addElem = S.addSvgElementFromJson, nonce = S.nonce, + randomize_ids = S.randomize_ids, selElems; svgCanvas.bind('setarrownonce', setArrowNonce); + svgCanvas.bind('unsetsetarrownonce', unsetArrowNonce); var lang_list = { "en":[ @@ -27,7 +29,11 @@ $(function() { }; var prefix = 'se_arrow_'; - var arrowprefix = prefix + nonce + '_'; + if (randomize_ids) { + var arrowprefix = prefix + nonce + '_'; + } else { + var arrowprefix = prefix; + } var pathdata = { fw: {d:"m0,0l10,5l-10,5l5,-5l-5,-5z", refx:8, id: arrowprefix + 'fw'}, @@ -35,8 +41,16 @@ $(function() { } function setArrowNonce(window, n) { + randomize_ids = true; arrowprefix = prefix + n + '_'; - pathdata.fw.id = arrowprefix + 'fw'; + pathdata.fw.id = arrowprefix + 'fw'; + pathdata.bk.id = arrowprefix + 'bk'; + } + + function unsetArrowNonce(window) { + randomize_ids = false; + arrowprefix = prefix; + pathdata.fw.id = arrowprefix + 'fw'; pathdata.bk.id = arrowprefix + 'bk'; } diff --git a/public/svg-edit/editor/images/logo.svg b/public/svg-edit/editor/images/logo.svg index 9adffe46..e71308be 100644 --- a/public/svg-edit/editor/images/logo.svg +++ b/public/svg-edit/editor/images/logo.svg @@ -1,291 +1,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Layer 1 + + + + + + + + + + + + Layer 2 + + diff --git a/public/svg-edit/editor/svg-editor.html b/public/svg-edit/editor/svg-editor.html index 6dd26ae8..e05a4b84 100644 --- a/public/svg-edit/editor/svg-editor.html +++ b/public/svg-edit/editor/svg-editor.html @@ -156,6 +156,12 @@ script type="text/javascript" src="locale/locale.min.js">
+