Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/icons.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/icons.png,v diff -u -r1.2.2.1 -r1.2.2.2 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/icons_hidpi.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/icons_hidpi.png,v diff -u -r1.1.2.1 -r1.1.2.2 Binary files differ Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/colordialog/dialogs/colordialog.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/div/dialogs/div.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/find/dialogs/find.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/forms/dialogs/button.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/forms/dialogs/checkbox.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/forms/dialogs/form.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/forms/dialogs/hiddenfield.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/forms/dialogs/radio.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/forms/dialogs/select.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/forms/dialogs/textarea.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/forms/dialogs/textfield.js'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/forms/images/hiddenfield.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/forms/images/hiddenfield.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/iframe/dialogs/iframe.js'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/iframe/images/placeholder.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/iframe/images/placeholder.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/liststyle/dialogs/liststyle.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/mathjax/dialogs/mathjax.js'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/mathjax/images/loader.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/mathjax/images/loader.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/pagebreak/images/pagebreak.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/pagebreak/images/pagebreak.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/preview/preview.html'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_address.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_address.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_blockquote.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_blockquote.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_div.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_div.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_h1.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_h1.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_h2.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_h2.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_h3.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_h3.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_h4.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_h4.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_h5.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_h5.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_h6.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_h6.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_p.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_p.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_pre.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/showblocks/images/block_pre.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/dialogs/smiley.js'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/angel_smile.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/angel_smile.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/angel_smile.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/angel_smile.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/angry_smile.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/angry_smile.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/angry_smile.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/angry_smile.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/broken_heart.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/broken_heart.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/broken_heart.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/broken_heart.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/confused_smile.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/confused_smile.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/confused_smile.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/confused_smile.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/cry_smile.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/cry_smile.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/cry_smile.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/cry_smile.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/devil_smile.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/devil_smile.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/devil_smile.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/devil_smile.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/embaressed_smile.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/embaressed_smile.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/embarrassed_smile.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/embarrassed_smile.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/embarrassed_smile.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/embarrassed_smile.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/envelope.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/envelope.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/envelope.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/envelope.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/heart.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/heart.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/heart.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/heart.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/kiss.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/kiss.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/kiss.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/kiss.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/lightbulb.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/lightbulb.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/lightbulb.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/lightbulb.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/omg_smile.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/omg_smile.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/omg_smile.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/omg_smile.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/regular_smile.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/regular_smile.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/regular_smile.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/regular_smile.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/sad_smile.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/sad_smile.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/sad_smile.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/sad_smile.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/shades_smile.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/shades_smile.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/shades_smile.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/shades_smile.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/teeth_smile.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/teeth_smile.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/teeth_smile.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/teeth_smile.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/thumbs_down.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/thumbs_down.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/thumbs_down.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/thumbs_down.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/thumbs_up.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/thumbs_up.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/thumbs_up.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/thumbs_up.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/tongue_smile.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/tongue_smile.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/tongue_smile.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/tongue_smile.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/tounge_smile.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/tounge_smile.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/whatchutalkingabout_smile.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/whatchutalkingabout_smile.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/whatchutalkingabout_smile.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/whatchutalkingabout_smile.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/wink_smile.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/wink_smile.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/wink_smile.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/smiley/images/wink_smile.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/sourcedialog/dialogs/sourcedialog.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/sourcedialog/dialogs/sourcedialog.js,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/sourcedialog/dialogs/sourcedialog.js 24 Jun 2013 13:38:24 -0000 1.1 +++ openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/sourcedialog/dialogs/sourcedialog.js 11 Feb 2015 09:59:15 -0000 1.1.2.1 @@ -1,78 +1,6 @@ -/** - * @license Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved. - * For licensing, see LICENSE.html or http://ckeditor.com/license - */ - -CKEDITOR.dialog.add( 'sourcedialog', function( editor ) { - var size = CKEDITOR.document.getWindow().getViewPaneSize(); - - // Make it maximum 800px wide, but still fully visible in the viewport. - var width = Math.min( size.width - 70, 800); - - // Make it use 2/3 of the viewport height. - var height = size.height / 1.5; - - // Store old editor data to avoid unnecessary setData. - var oldData; - - return { - title: editor.lang.sourcedialog.title, - minWidth: 100, - minHeight: 100, - - onShow: function() { - this.setValueOf( 'main', 'data', oldData = editor.getData() ); - }, - - onOk: (function() { - function setData( newData ) { - var that = this; - - editor.setData( newData, function() { - that.hide(); - - // Ensure correct selection. - var range = editor.createRange(); - range.moveToElementEditStart( editor.editable() ); - range.select(); - } ); - } - - return function( event ) { - // Remove CR from input data for reliable comparison with editor data. - var newData = this.getValueOf( 'main', 'data' ).replace( /\r/g, '' ); - - // Avoid unnecessary setData. Also preserve selection - // when user changed his mind and goes back to wysiwyg editing. - if ( newData === oldData ) - return true; - - // Set data asynchronously to avoid errors in IE. - CKEDITOR.env.ie ? - CKEDITOR.tools.setTimeout( setData, 0, this, newData ) - : - setData.call( this, newData ); - - // Don't let the dialog close before setData is over. - return false; - }; - })(), - - contents: [{ - id: 'main', - label: editor.lang.sourcedialog.title, - elements: [{ - type: 'textarea', - type: 'textarea', - id: 'data', - dir: 'ltr', - inputStyle: 'cursor:auto;' + - 'width:' + width + 'px;' + - 'height:' + height + 'px;' + - 'tab-size:4;' + - 'text-align:left;', - 'class': 'cke_source' - }] - }] - }; -}); +/* + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. + For licensing, see LICENSE.md or http://ckeditor.com/license +*/ +CKEDITOR.dialog.add("sourcedialog",function(a){var b=CKEDITOR.document.getWindow().getViewPaneSize(),e=Math.min(b.width-70,800),b=b.height/1.5,d;return{title:a.lang.sourcedialog.title,minWidth:100,minHeight:100,onShow:function(){this.setValueOf("main","data",d=a.getData())},onOk:function(){function b(f,c){a.focus();a.setData(c,function(){f.hide();var b=a.createRange();b.moveToElementEditStart(a.editable());b.select()})}return function(){var a=this.getValueOf("main","data").replace(/\r/g,""),c=this; +if(a===d)return!0;setTimeout(function(){b(c,a)});return!1}}(),contents:[{id:"main",label:a.lang.sourcedialog.title,elements:[{type:"textarea",id:"data",dir:"ltr",inputStyle:"cursor:auto;width:"+e+"px;height:"+b+"px;tab-size:4;text-align:left;","class":"cke_source"}]}]}}); \ No newline at end of file Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/templates/dialogs/templates.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/templates/dialogs/templates.js'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/templates/templates/default.js'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/templates/templates/images/template1.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/templates/templates/images/template1.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/templates/templates/images/template2.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/templates/templates/images/template2.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/templates/templates/images/template3.gif =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/templates/templates/images/template3.gif,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/widget/images/handle.png =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/widget/images/handle.png,v diff -u -r1.1 -r1.1.2.1 Binary files differ Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/xowikiimage/plugin.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/xowikiimage/plugin.js,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/xowikiimage/plugin.js 24 Jun 2013 13:38:27 -0000 1.1 +++ openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/xowikiimage/plugin.js 11 Feb 2015 09:59:17 -0000 1.1.2.1 @@ -1,53 +1,102 @@ - -var xowikiimage_dialog = $("
X
"); - -xowikiimage_dialog.dialog({ - modal: true, - width: '715px', - autoOpen: false, - zIndex: 10000 -}); - CKEDITOR.plugins.add( 'xowikiimage', { + requires: ['widget', 'iframedialog','fakeobjects'], lang : [ 'en', 'de' ], - init : function( editor ) { - var pluginName = 'xowikiimage'; - editor.addCommand(pluginName, { - exec: function(editor) { - xowikiimage_dialog.load(editor.config.imageSelectorDialog, {parent_id: editor.config.parent_id}, function() { - xowikiimage_dialog.dialog({title:editor.lang.xowikiimage['insertImage']}); - xowikiimage_dialog.dialog("open"); - xowikiimage_dialog.find('input').keypress(function(e) { - if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) { - return false; - } - }); - xowikiimage_dialog.find("#insert_form").submit(function() { - var pathname = window.location.pathname; - pathname = pathname.substr(pathname.lastIndexOf("/")+1,pathname.length) - insert_the_image(xowikiimage_dialog.find("#f_url").val().replace(/file:/g, "image:"), - pathname+'/'+xowikiimage_dialog.find("#f_url").val()+'?m=download', - editor); - xowikiimage_dialog.dialog("close"); - return false; - }); - }); - }}); + var pluginName = 'xowikiimage'; + + //dialog + var height = 600; + var width = 800; - // Register the toolbar button. - editor.ui.addButton( 'xowikiImage', { - label : editor.lang.xowikiimage['insertImage'], - command : pluginName, - icon: this.path + 'images/image.gif' - }); - } -} ); + // CKEDITOR dialog addIframe + // NOTE: addIframe is not documented well online the parameters (especially src) needed are only seen in source code + // addIframe (name, title, src, minWidth, minHeight, [onContentLoad], [userDefinition]) + CKEDITOR.dialog.addIframe('xowikiimage' , 'Image', + editor.config.imageSelectorDialog, width, height, + function () { + domId = this.domId; + //an ugly bug in ckeditor can lead to tiny iframe dialogs + $(".cke_dialog_ui_vbox_child").css('width', width); + $(".cke_dialog_ui_vbox_child").css('height', height); + }, + { + onOk: function(e) { + //console.log('onok'); + var context = ($("#"+domId).contents())[0]; + var pathname = window.location.pathname; + // bugfix: get correct editor via this instead of global editor: var selection = editor.widgets.selected; + var selection = this["_"].editor.widgets.selected; + if (selection[0] != null) { + widget_scoped = selection[0]; + } + //insert_the_image($("#f_url", context).val().replace(/file:/g, "image:"), + insert_the_media($("#f_url", context).val().replace(/file:/g, ""), + pathname+'/'+$("#f_url",context).val()+'?m=download', + editor, + $("#f_mime",context).val(), + widget_scoped, + $("#f_width",context).val(), + $("#f_height",context).val()); + } + } + ); + + // Widget definition + editor.widgets.add(pluginName, { + defaults: { + fileObjectPrettyLink: '', + fileObjectName: '', + fileObjectMimeType: '', + playerSize: '' + }, + template: + '' + + '' + + '' + + '', + parts: { + content: 'span.xowiki-image-media-content', + img: 'img' + }, + allowedContent: + 'img;', -var insert_the_image=function (me,src,editor) { - editor.insertHtml("\".SELF./"+me+"\""); - //editor.insertHtml(me); -} + dialog: pluginName, + upcast: function( element ) { + //returns true if element should be a widget + //console.debug('upcast'); + //console.debug(element); + return element.name == 'span' && element.hasClass( 'xowiki-image' ); + }, + + init: function(w) { + //console.debug('init'); + }, + data: function(w) { + widget_scoped = w.sender; + } + }); + // Register the toolbar button. + editor.ui.addButton( 'xowikiimage', { + label : editor.lang.xowikiimage['insertImage'], + command : pluginName, + icon: this.path + 'images/image.gif' + }); + + + } +} ); + +function insert_the_media(filename, src, editor, mimetype, widget, width, height) { + var media_array = mimetype.split("/"); + switch(media_array[0]) { + case 'image': + widget.parts.img.setAttribute('src', src); + widget.parts.img.setAttribute('alt', '.SELF./image:'+ filename); + widget.parts.img.setAttribute('type', 'wikilink'); + break; + } +} \ No newline at end of file Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/xowikiimage/lang/de.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/xowikiimage/lang/de.js,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/xowikiimage/lang/de.js 24 Jun 2013 13:38:27 -0000 1.1 +++ openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/xowikiimage/lang/de.js 11 Feb 2015 09:59:17 -0000 1.1.2.1 @@ -1,6 +1,3 @@ CKEDITOR.plugins.setLang( 'xowikiimage', 'de', { - xowikiimage : { insertImage : 'Bild einfügen' - } }); - Index: openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/xowikiimage/lang/en.js =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/xowikiimage/lang/en.js,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/xowikiimage/lang/en.js 24 Jun 2013 13:38:27 -0000 1.1 +++ openacs-4/packages/xowiki/www/resources/ckeditor4/plugins/xowikiimage/lang/en.js 11 Feb 2015 09:59:17 -0000 1.1.2.1 @@ -1,5 +1,3 @@ CKEDITOR.plugins.setLang( 'xowikiimage', 'en', { - xowikiimage : { insertImage : 'Insert Image' - } });