Permalink
Browse files

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

  • Loading branch information...
2 parents 477adef + cebd381 commit d20872806500468f742d5f6bb3606186e851f703 @distler distler committed Oct 15, 2010
Showing with 1,090 additions and 867 deletions.
  1. +17 −0 CHANGELOG
  2. +1 −1 Gemfile
  3. +1 −1 app/controllers/application_controller.rb
  4. +1 −1 public/stylesheets/instiki.css
  5. +39 −33 public/svg-edit/editor/contextmenu/jquery.contextMenu.js
  6. +3 −1 public/svg-edit/editor/extensions/ext-imagelib.js
  7. +0 −191 public/svg-edit/editor/jgraduate/css/jPicker-1.0.12.css
  8. +1 −0 public/svg-edit/editor/jgraduate/css/jPicker.css
  9. BIN public/svg-edit/editor/jgraduate/images/Bars.png
  10. BIN public/svg-edit/editor/jgraduate/images/Maps.png
  11. BIN public/svg-edit/editor/jgraduate/images/NoColor.png
  12. BIN public/svg-edit/editor/jgraduate/images/rangearrows.gif
  13. +0 −1 public/svg-edit/editor/jgraduate/jpicker-1.0.12.min.js
  14. +1 −0 public/svg-edit/editor/jgraduate/jpicker.min.js
  15. +23 −35 public/svg-edit/editor/jgraduate/jquery.jgraduate.js
  16. +138 −135 public/svg-edit/editor/locale/lang.it.js
  17. +3 −2 public/svg-edit/editor/svg-editor.html
  18. +177 −146 public/svg-edit/editor/svg-editor.js
  19. +311 −197 public/svg-edit/editor/svgcanvas.js
  20. +18 −13 public/svg-edit/test/test1.html
  21. +1 −1 vendor/plugins/rails_xss/init.rb
  22. +1 −0 vendor/rails/actionmailer/CHANGELOG
  23. +1 −1 vendor/rails/actionmailer/Rakefile
  24. +1 −1 vendor/rails/actionmailer/lib/action_mailer/version.rb
  25. +2 −0 vendor/rails/actionpack/CHANGELOG
  26. +1 −1 vendor/rails/actionpack/Rakefile
  27. +4 −2 vendor/rails/actionpack/lib/action_controller/base.rb
  28. +3 −2 vendor/rails/actionpack/lib/action_controller/integration.rb
  29. +8 −2 vendor/rails/actionpack/lib/action_controller/session/abstract_store.rb
  30. +3 −2 vendor/rails/actionpack/lib/action_controller/session/cookie_store.rb
  31. +2 −0 vendor/rails/actionpack/lib/action_controller/url_rewriter.rb
  32. +1 −1 vendor/rails/actionpack/lib/action_pack/version.rb
  33. +3 −3 vendor/rails/actionpack/lib/action_view/helpers/form_helper.rb
  34. +10 −0 vendor/rails/actionpack/test/controller/cookie_test.rb
  35. +18 −0 vendor/rails/actionpack/test/controller/integration_test.rb
  36. +22 −6 vendor/rails/actionpack/test/controller/session/cookie_store_test.rb
  37. +6 −9 vendor/rails/actionpack/test/controller/session/mem_cache_store_test.rb
  38. +0 −17 vendor/rails/actionpack/test/template/form_helper_test.rb
  39. +4 −0 vendor/rails/activerecord/CHANGELOG
  40. +1 −1 vendor/rails/activerecord/Rakefile
  41. +37 −3 vendor/rails/activerecord/examples/performance.rb
  42. +1 −1 vendor/rails/activerecord/lib/active_record/association_preload.rb
  43. +15 −2 vendor/rails/activerecord/lib/active_record/associations/association_collection.rb
  44. +2 −1 vendor/rails/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
  45. +1 −1 vendor/rails/activerecord/lib/active_record/named_scope.rb
  46. +8 −11 vendor/rails/activerecord/lib/active_record/nested_attributes.rb
  47. +1 −1 vendor/rails/activerecord/lib/active_record/version.rb
  48. +6 −1 vendor/rails/activerecord/test/cases/associations/eager_test.rb
  49. +5 −0 vendor/rails/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
  50. +6 −1 vendor/rails/activerecord/test/cases/associations/has_many_associations_test.rb
  51. +14 −0 vendor/rails/activerecord/test/cases/associations/has_many_through_associations_test.rb
  52. +7 −0 vendor/rails/activerecord/test/cases/migration_test.rb
  53. +6 −0 vendor/rails/activerecord/test/cases/named_scope_test.rb
  54. +12 −14 vendor/rails/activerecord/test/cases/nested_attributes_test.rb
  55. +1 −0 vendor/rails/activeresource/CHANGELOG
  56. +1 −1 vendor/rails/activeresource/Rakefile
  57. +1 −1 vendor/rails/activeresource/lib/active_resource/version.rb
  58. +3 −0 vendor/rails/activesupport/CHANGELOG
  59. +1 −1 vendor/rails/activesupport/lib/active_support/core_ext/object/misc.rb
  60. +2 −0 vendor/rails/activesupport/lib/active_support/memoizable.rb
  61. +2 −2 vendor/rails/activesupport/lib/active_support/testing/setup_and_teardown.rb
  62. +1 −1 vendor/rails/activesupport/lib/active_support/version.rb
  63. +14 −0 vendor/rails/activesupport/test/memoizable_test.rb
  64. +57 −0 vendor/rails/activesupport/test/test_case_test.rb
  65. +2 −0 vendor/rails/railties/CHANGELOG
  66. +5 −5 vendor/rails/railties/Rakefile
  67. +4 −2 vendor/rails/railties/lib/rails/gem_dependency.rb
  68. +2 −2 vendor/rails/railties/lib/rails/vendor_gem_source_index.rb
  69. +1 −1 vendor/rails/railties/lib/rails/version.rb
  70. +9 −9 vendor/rails/railties/lib/tasks/databases.rake
  71. +8 −0 vendor/rails/railties/test/gem_dependency_test.rb
  72. +28 −0 vendor/rails/railties/test/vendor/gems/dummy-gem-l-1.0.0-x86-mswin32/.specification
  73. +1 −0 vendor/rails/railties/test/vendor/gems/dummy-gem-l-1.0.0-x86-mswin32/lib/dummy-gem-l.rb
View
@@ -6,6 +6,23 @@ N.B.: You *must* run
after installing the new software, to enjoy the benefits of this new version.
------------------------------------------------------------------------------
+* 0.19.1
+
+New Features:
+* From the "All" or Category listings, you can export selected pages (in any
+ desired order) to a single LaTeX file.
+* LaTeX export supports \array{} (with no options) and a LaTeX-style optional
+ argument for \sqrt[]{}. The latter requires itextomml 1.4.5 or later.
+* Updated to itextomml 1.4.5 (a bunch of new itex language features).
+* Updated to Rails 2.3.10. (There were security issues in 2.3.9 which, happily,
+ did NOT affect Instiki 0.19. But 2.3.10 has other improvements, as well.)
+
+Bugs Fixed:
+* Several SVG-Edit bugs fixed.
+* Removed some superfluous junk, to slim down the distribution (cuts the size of
+ the compressed .tar.gz nearly in half).
+
+------------------------------------------------------------------------------
* 0.19
New Features:
View
@@ -1,6 +1,6 @@
source "http://rubygems.org"
gem "sqlite3-ruby", :require => "sqlite3"
-gem "itextomml", ">=1.4.2"
+gem "itextomml", ">=1.4.5"
gem "mongrel", ">=1.2.0.pre2"
gem "rubyzip"
gem "erubis"
@@ -282,7 +282,7 @@ module Instiki
module VERSION #:nodoc:
MAJOR = 0
MINOR = 19
- TINY = 0
+ TINY = 1
SUFFIX = '(MML+)'
PRERELEASE = false
if PRERELEASE
@@ -427,7 +427,7 @@ padding-left:0;
ul#sortable_pages li {
border: 1px solid #FFF;
}
-ul#sortable_pages li:hover {
+ul#sortable_pages li:hover, ul#sortable_pages li:focus {
border: 1px solid blue;
}
@@ -14,6 +14,9 @@
// and the MIT License and is copyright A Beautiful Site, LLC.
//
if(jQuery)( function() {
+ var win = $(window);
+ var doc = $(document);
+
$.extend($.fn, {
contextMenu: function(o, callback) {
@@ -28,75 +31,78 @@ if(jQuery)( function() {
$(this).each( function() {
var el = $(this);
var offset = $(el).offset();
+
+ var menu = $('#' + o.menu);
+
// Add contextMenu class
- $('#' + o.menu).addClass('contextMenu');
+ menu.addClass('contextMenu');
+
// Simulate a true right click
$(this).mousedown( function(e) {
var evt = e;
$(this).mouseup( function(e) {
var srcElement = $(this);
- $(this).unbind('mouseup');
- if( evt.button == 2 || o.allowLeft) {
+ srcElement.unbind('mouseup');
+ if( evt.button === 2 || o.allowLeft) {
e.stopPropagation();
// Hide context menus that may be showing
$(".contextMenu").hide();
// Get this context menu
- var menu = $('#' + o.menu);
-
- if( $(el).hasClass('disabled') ) return false;
+
+ if( el.hasClass('disabled') ) return false;
// Detect mouse position
var d = {}, x = e.pageX, y = e.pageY;
- var x_off = $(window).width() - menu.width(),
- y_off = $(window).height() - menu.height();
-
- if(x > x_off) x = x_off-15;
- if(y > y_off) y = y_off-15;
+ var x_off = win.width() - menu.width(),
+ y_off = win.height() - menu.height();
+
+ if(x > x_off - 15) x = x_off-15;
+ if(y > y_off - 30) y = y_off-30; // 30 is needed to prevent scrollbars in FF
// Show the menu
- $(document).unbind('click');
- $(menu).css({ top: y, left: x }).fadeIn(o.inSpeed);
+ doc.unbind('click');
+ menu.css({ top: y, left: x }).fadeIn(o.inSpeed);
// Hover events
- $(menu).find('A').mouseover( function() {
- $(menu).find('LI.hover').removeClass('hover');
+ menu.find('A').mouseover( function() {
+ menu.find('LI.hover').removeClass('hover');
$(this).parent().addClass('hover');
}).mouseout( function() {
- $(menu).find('LI.hover').removeClass('hover');
+ menu.find('LI.hover').removeClass('hover');
});
// Keyboard
- $(document).keypress( function(e) {
+ doc.keypress( function(e) {
switch( e.keyCode ) {
case 38: // up
- if( $(menu).find('LI.hover').size() == 0 ) {
- $(menu).find('LI:last').addClass('hover');
+ if( !menu.find('LI.hover').length ) {
+ menu.find('LI:last').addClass('hover');
} else {
- $(menu).find('LI.hover').removeClass('hover').prevAll('LI:not(.disabled)').eq(0).addClass('hover');
- if( $(menu).find('LI.hover').size() == 0 ) $(menu).find('LI:last').addClass('hover');
+ menu.find('LI.hover').removeClass('hover').prevAll('LI:not(.disabled)').eq(0).addClass('hover');
+ if( !menu.find('LI.hover').length ) menu.find('LI:last').addClass('hover');
}
break;
case 40: // down
- if( $(menu).find('LI.hover').size() == 0 ) {
- $(menu).find('LI:first').addClass('hover');
+ if( menu.find('LI.hover').length == 0 ) {
+ menu.find('LI:first').addClass('hover');
} else {
- $(menu).find('LI.hover').removeClass('hover').nextAll('LI:not(.disabled)').eq(0).addClass('hover');
- if( $(menu).find('LI.hover').size() == 0 ) $(menu).find('LI:first').addClass('hover');
+ menu.find('LI.hover').removeClass('hover').nextAll('LI:not(.disabled)').eq(0).addClass('hover');
+ if( !menu.find('LI.hover').length ) menu.find('LI:first').addClass('hover');
}
break;
case 13: // enter
- $(menu).find('LI.hover A').trigger('click');
+ menu.find('LI.hover A').trigger('click');
break;
case 27: // esc
- $(document).trigger('click');
+ doc.trigger('click');
break
}
});
// When items are selected
- $('#' + o.menu).find('A').unbind('mouseup');
- $('#' + o.menu).find('LI:not(.disabled) A').mouseup( function() {
- $(document).unbind('click').unbind('keypress');
+ menu.find('A').unbind('mouseup');
+ menu.find('LI:not(.disabled) A').mouseup( function() {
+ doc.unbind('click').unbind('keypress');
$(".contextMenu").hide();
// Callback
if( callback ) callback( $(this).attr('href').substr(1), $(srcElement), {x: x - offset.left, y: y - offset.top, docX: x, docY: y} );
@@ -105,9 +111,9 @@ if(jQuery)( function() {
// Hide bindings
setTimeout( function() { // Delay for Mozilla
- $(document).click( function() {
- $(document).unbind('click').unbind('keypress');
- $(menu).fadeOut(o.outSpeed);
+ doc.click( function() {
+ doc.unbind('click').unbind('keypress');
+ menu.fadeOut(o.outSpeed);
return false;
});
}, 0);
@@ -289,10 +289,11 @@ svgEditor.addExtension("imagelib", function() {
var leftBlock = $('<span>').css({position:'absolute',top:5,left:10}).appendTo(browser);
- var back = $('<button>Show libraries</button>').appendTo(leftBlock).click(function() {
+ var back = $('<button hidden>Show library list</button>').appendTo(leftBlock).click(function() {
frame.attr('src', 'about:blank').hide();
lib_opts.show();
header.text(all_libs);
+ back.hide();
}).css({
'margin-right': 5
});
@@ -321,6 +322,7 @@ svgEditor.addExtension("imagelib", function() {
frame.attr('src', opts.url).show();
header.text(opts.name);
lib_opts.hide();
+ back.show();
}).append('<span>' + opts.description + '</span>');
});
@@ -1,191 +0,0 @@
-.jPicker_Picker {
- display: inline-block;
- height: 24px; /* change this value if using a different sized color picker icon */
- position: relative; /* make this element an absolute positioning container */
- text-align: left; /* make the zero width children position to the left of container */
- width: 25px; /* change this value if using a different sized color picker icon */
-}
-.jPicker_Color, .jPicker_Alpha {
- background-position: 2px 2px;
- display: block;
- height: 100%;
- left: 0px;
- position: absolute;
- top: 0px;
- width: 100%;
-}
-.jPicker_Icon {
- background-repeat: no-repeat;
- cursor: pointer;
- display: block;
- height: 100%;
- left: 0px;
- position: absolute;
- top: 0px;
- width: 100%;
-}
-.jPicker_Container {
- display: none;
- z-index: 10; /* make sure container draws above color picker icon in Firefox/Safari/Chrome/Opera/etc. -
- IE calculates z-index so this won't work - we will hide all color picker icons placed after the selected one in code when shown in IE */
-}
-.jPicker_table {
- background-color: #efefef;
- border: 1px outset #666;
- font-family: Arial, Helvetica, Sans-Serif;
- font-size: 12px;
- margin: 0px;
- padding: 5px;
- width: 550px;
-}
-.jPicker_table td {
- margin: 0px;
- padding: 0px;
- vertical-align: top;
-}
-.jPicker_MoveBar {
- background-color: #dddddd;
- border: 1px outset #aaa;
- cursor: move;
- height: 12px;
-}
-.jPicker_Title {
- font-size: 11px !important;
- font-weight: bold;
- margin: -2px 0px 0px 0px;
- padding: 0px;
- text-align: center;
- width: 100%;
-}
-.jPicker_ColorMap {
- border: 2px inset #eee;
- cursor: crosshair;
- height: 260px; /* IE 6 incorrectly draws border inside the width and height instead of outside - We will fix this to 256px later */
- margin: 0px 5px 0px 5px;
- overflow: hidden; /* hide the overdraw of the Color Map icon when at edge of viewing box */
- padding: 0px;
- position: relative; /* make this element an absolute positioning container */
- width: 260px; /* IE 6 incorrectly draws border inside the width and height instead of outside - We will fix this to 256px later */
-}
-div[class="jPicker_ColorMap"] {
- height: 256px; /* correct to 256px for browsers that support the "[class="xxx"]" selector (IE7+,Firefox,Safari,Chrome,Opera,etc.) */
- width: 256px; /* correct to 256px for browsers that support the "[class="xxx"]" selector (IE7+,Firefox,Safari,Chrome,Opera,etc.) */
-}
-.jPicker_ColorBar {
- border: 2px inset #eee;
- cursor: n-resize;
- height: 260px; /* IE 6 incorrectly draws border inside the width and height instead of outside - We will fix this to 256px later */
- margin: 12px 10px 0px 5px;
- padding: 0px;
- position: relative;
- width: 24px; /* IE 6 incorrectly draws border inside the width and height instead of outside - We will fix this to 20px later */
-}
-div[class="jPicker_ColorBar"] {
- height: 256px; /* correct to 256px for browsers that support the "[class="xxx"]" selector (IE7+,Firefox,Safari,Chrome,Opera,etc.) */
- width: 20px; /* correct to 20px for browsers that support the "[class="xxx"]" selector (IE7+,Firefox,Safari,Chrome,Opera,etc.) */
-}
-.jPicker_ColorMap_l1, .jPicker_ColorMap_l2, .jPicker_ColorMap_l3, .jPicker_ColorBar_l1, .jPicker_ColorBar_l2, .jPicker_ColorBar_l3, .jPicker_ColorBar_l4, .jPicker_ColorBar_l5, .jPicker_ColorBar_l6 {
- background-color: transparent;
- background-image: none;
- display: block;
- height: 256px; /* must specific pixel height. IE7/8 Quirks mode ignores opacity for an absolutely positioned item in a relative container with "overflow: visible". The marker in the colorBar
- would not be drawn if its overflow is set to hidden. */
- left: 0px;
- position: absolute;
- top: 0px;
-}
-.jPicker_ColorMap_l1, .jPicker_ColorMap_l2, .jPicker_ColorMap_l3 {
- width: 256px; /* must specific pixel width. IE7/8 Quirks mode ignores opacity for an absolutely positioned item in a relative container with "overflow: visible". The marker in the colorBar
- would not be drawn if its overflow is set to hidden. */
-}
-.jPicker_ColorBar_l1, .jPicker_ColorBar_l2, .jPicker_ColorBar_l3, .jPicker_ColorBar_l4, .jPicker_ColorBar_l5, .jPicker_ColorBar_l6 {
- width: 20px; /* must specific pixel width. IE7/8 Quirks mode ignores opacity for an absolutely positioned item in a relative container with "overflow: visible". The marker in the colorBar
- would not be drawn if its overflow is set to hidden. */
-}
-.jPicker_ColorMap_l1, .jPicker_ColorMap_l2, .jPicker_ColorBar_l6 {
- background-repeat: no-repeat;
-}
-.jPicker_ColorMap_l3, .jPicker_ColorBar_l5 {
- background-repeat: repeat;
-}
-.jPicker_ColorBar_l1, .jPicker_ColorBar_l2, .jPicker_ColorBar_l3, .jPicker_ColorBar_l4 {
- background-repeat: repeat-x;
-}
-.jPicker_ColorMap_Arrow {
- display: block;
- position: absolute;
-}
-.jPicker_ColorBar_Arrow {
- display: block;
- left: -10px; /* (arrow width / 2) - (element width / 2) - position arrows' center in elements' center */
- position: absolute;
-}
-.jPicker_Preview {
- font-size: x-small;
- text-align: center;
-}
-.jPicker_Preview div {
- border: 2px inset #eee;
- height: 62px;
- margin: 0px auto;
- padding: 0px;
- width: 62px;
-}
-.jPicker_Preview div span {
- border: 1px solid #000;
- display: block;
- height: 30px;
- margin: 0px auto;
- padding: 0px;
- width: 60px;
-}
-.jPicker_Preview div span.jPicker_Active {
- border-bottom-width: 0px;
-}
-.jPicker_Preview div span.jPicker_Current {
- border-top-width: 0px;
- cursor: pointer;
-}
-.jPicker_OkCancel {
- text-align: center;
- width: 120px;
-}
-.jPicker_OkCancel input {
- width: 100px;
-}
-.jPicker_OkCancel input.jPicker_Ok {
- margin: 12px 0px 5px 0px;
-}
-.jPicker_Text {
- text-align: left;
-}
-.jPicker_HueText, .jPicker_SaturationText, .jPicker_BrightnessText, .jPicker_RedText, .jPicker_GreenText, .jPicker_BlueText, .jPicker_AlphaText {
- background-color: #fff;
- border: 1px inset #aaa;
- margin: 0px 0px 0px 5px;
- text-align: left;
- width: 30px;
-}
-.jPicker_HexText {
- background-color: #fff;
- border: 1px inset #aaa;
- margin: 0px 0px 0px 5px;
- width: 65px;
-}
-.jPicker_Grid {
- text-align: center;
-}
-span.jPicker_QuickColor {
- border: 1px inset #aaa;
- cursor: pointer;
- display: block;
- float: left;
- height: 13px;
- line-height: 13px;
- margin: 2px 2px 1px 2px;
- padding: 0px;
- width: 15px;
-}
-span[class="jPicker_QuickColor"] {
- width: 13px;
-}

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit d208728

Please sign in to comment.