Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 't/12338'
  • Loading branch information
Reinmar committed Sep 21, 2014
2 parents 29887c2 + a516634 commit 590deeb
Show file tree
Hide file tree
Showing 85 changed files with 47 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES.md
Expand Up @@ -24,6 +24,7 @@ Fixed Issues:
* [#12162](http://dev.ckeditor.com/ticket/12162): Fixed: Auto paragraphing and enter key in nested editables.
* [#12354](http://dev.ckeditor.com/ticket/12354): Fixed: Various issues in undo manager when holding keys.
* [#12402](http://dev.ckeditor.com/ticket/12402): Fixed: Workaround for Blink's bug with `document.title` which breaks updating title in the full HTML mode.
* [#12338](http://dev.ckeditor.com/ticket/12338): Fixed: CKEditor package contains unoptimised images.

## CKEditor 4.4.4

Expand Down
43 changes: 43 additions & 0 deletions Gruntfile.js
@@ -0,0 +1,43 @@
/* jshint node: true, browser: false, es3: false */

'use strict';

module.exports = function( grunt ) {
grunt.initConfig( {
imagemin: {
plugins: {
files: [ {
expand: true,
cwd: '.',
src: [
'plugins/*/images/**/*.{png,jpg,gif}'
]
} ]
},

skins: {
files: [ {
expand: true,
cwd: '.',
src: [
'skins/*/images/**/*.{png,jpg,gif}'
]
} ]
},

samples: {
files: [ {
expand: true,
cwd: '.',
src: [
'samples/**/*.{png,jpg,gif}',
'plugins/*/samples/**/*.{png,jpg,gif}'
]
} ]
}
}
} );

grunt.loadNpmTasks( 'grunt-contrib-imagemin' );
grunt.registerTask( 'images', [ 'imagemin' ] );
};
4 changes: 3 additions & 1 deletion package.json
Expand Up @@ -6,7 +6,9 @@
"benderjs-jquery": "~0.2.0",
"benderjs-yui": "~0.2.0",
"jscs": "^1.6.0",
"jshint": "^2.5.2"
"jshint": "^2.5.2",
"grunt": "^0.4.5",
"grunt-contrib-imagemin": "^0.8.1"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
Expand Down
Binary file modified plugins/iframe/images/placeholder.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/image2/samples/assets/image1.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/image2/samples/assets/image2.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/link/images/anchor.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/link/images/hidpi/anchor.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/magicline/images/hidpi/icon-rtl.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/magicline/images/hidpi/icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/magicline/images/icon-rtl.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/magicline/images/icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/mathjax/images/loader.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/showblocks/images/block_address.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/showblocks/images/block_blockquote.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/showblocks/images/block_div.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/showblocks/images/block_h1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/showblocks/images/block_h2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/showblocks/images/block_h3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/showblocks/images/block_h4.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/showblocks/images/block_h5.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/showblocks/images/block_h6.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/showblocks/images/block_p.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/showblocks/images/block_pre.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/smiley/images/angel_smile.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/smiley/images/angel_smile.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/smiley/images/angry_smile.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/smiley/images/angry_smile.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/smiley/images/broken_heart.gif
Binary file modified plugins/smiley/images/broken_heart.png
Binary file modified plugins/smiley/images/confused_smile.gif
Binary file modified plugins/smiley/images/confused_smile.png
Binary file modified plugins/smiley/images/cry_smile.png
Binary file modified plugins/smiley/images/devil_smile.png
Binary file modified plugins/smiley/images/embaressed_smile.gif
Binary file modified plugins/smiley/images/embarrassed_smile.gif
Binary file modified plugins/smiley/images/embarrassed_smile.png
Binary file modified plugins/smiley/images/envelope.gif
Binary file modified plugins/smiley/images/envelope.png
Binary file modified plugins/smiley/images/heart.gif
Binary file modified plugins/smiley/images/heart.png
Binary file modified plugins/smiley/images/kiss.gif
Binary file modified plugins/smiley/images/kiss.png
Binary file modified plugins/smiley/images/lightbulb.gif
Binary file modified plugins/smiley/images/lightbulb.png
Binary file modified plugins/smiley/images/omg_smile.gif
Binary file modified plugins/smiley/images/omg_smile.png
Binary file modified plugins/smiley/images/regular_smile.gif
Binary file modified plugins/smiley/images/regular_smile.png
Binary file modified plugins/smiley/images/sad_smile.gif
Binary file modified plugins/smiley/images/sad_smile.png
Binary file modified plugins/smiley/images/shades_smile.gif
Binary file modified plugins/smiley/images/shades_smile.png
Binary file modified plugins/smiley/images/teeth_smile.gif
Binary file modified plugins/smiley/images/teeth_smile.png
Binary file modified plugins/smiley/images/thumbs_down.gif
Binary file modified plugins/smiley/images/thumbs_down.png
Binary file modified plugins/smiley/images/thumbs_up.gif
Binary file modified plugins/smiley/images/thumbs_up.png
Binary file modified plugins/smiley/images/tongue_smile.gif
Binary file modified plugins/smiley/images/tongue_smile.png
Binary file modified plugins/smiley/images/tounge_smile.gif
Binary file modified plugins/smiley/images/whatchutalkingabout_smile.gif
Binary file modified plugins/smiley/images/whatchutalkingabout_smile.png
Binary file modified plugins/smiley/images/wink_smile.gif
Binary file modified plugins/smiley/images/wink_smile.png
Binary file modified plugins/widget/images/handle.png
Binary file modified samples/assets/inlineall/logo.png
Binary file modified samples/assets/sample.jpg
Binary file modified skins/kama/images/dialog_sides.gif
Binary file modified skins/kama/images/dialog_sides.png
Binary file modified skins/kama/images/dialog_sides_rtl.png
Binary file modified skins/kama/images/mini.gif
Binary file modified skins/kama/images/sprites.png
Binary file modified skins/kama/images/sprites_ie6.png
Binary file modified skins/kama/images/toolbar_start.gif
Binary file modified skins/moono/images/arrow.png
Binary file modified skins/moono/images/close.png
Binary file modified skins/moono/images/hidpi/close.png
Binary file modified skins/moono/images/hidpi/lock-open.png
Binary file modified skins/moono/images/hidpi/lock.png
Binary file modified skins/moono/images/hidpi/refresh.png
Binary file modified skins/moono/images/lock-open.png
Binary file modified skins/moono/images/lock.png
Binary file modified skins/moono/images/refresh.png

0 comments on commit 590deeb

Please sign in to comment.