Skip to content
Permalink
Browse files

Merge branch 't/12338'

  • Loading branch information...
Reinmar committed Sep 21, 2014
2 parents 29887c2 + a516634 commit 590deeb00843f1155c6b3d2223727dca27b09390
Showing with 47 additions and 1 deletion.
  1. +1 −0 CHANGES.md
  2. +43 −0 Gruntfile.js
  3. +3 −1 package.json
  4. BIN plugins/iframe/images/placeholder.png
  5. BIN plugins/image2/samples/assets/image1.jpg
  6. BIN plugins/image2/samples/assets/image2.jpg
  7. BIN plugins/link/images/anchor.png
  8. BIN plugins/link/images/hidpi/anchor.png
  9. BIN plugins/magicline/images/hidpi/icon-rtl.png
  10. BIN plugins/magicline/images/hidpi/icon.png
  11. BIN plugins/magicline/images/icon-rtl.png
  12. BIN plugins/magicline/images/icon.png
  13. BIN plugins/mathjax/images/loader.gif
  14. BIN plugins/showblocks/images/block_address.png
  15. BIN plugins/showblocks/images/block_blockquote.png
  16. BIN plugins/showblocks/images/block_div.png
  17. BIN plugins/showblocks/images/block_h1.png
  18. BIN plugins/showblocks/images/block_h2.png
  19. BIN plugins/showblocks/images/block_h3.png
  20. BIN plugins/showblocks/images/block_h4.png
  21. BIN plugins/showblocks/images/block_h5.png
  22. BIN plugins/showblocks/images/block_h6.png
  23. BIN plugins/showblocks/images/block_p.png
  24. BIN plugins/showblocks/images/block_pre.png
  25. BIN plugins/smiley/images/angel_smile.gif
  26. BIN plugins/smiley/images/angel_smile.png
  27. BIN plugins/smiley/images/angry_smile.gif
  28. BIN plugins/smiley/images/angry_smile.png
  29. BIN plugins/smiley/images/broken_heart.gif
  30. BIN plugins/smiley/images/broken_heart.png
  31. BIN plugins/smiley/images/confused_smile.gif
  32. BIN plugins/smiley/images/confused_smile.png
  33. BIN plugins/smiley/images/cry_smile.png
  34. BIN plugins/smiley/images/devil_smile.png
  35. BIN plugins/smiley/images/embaressed_smile.gif
  36. BIN plugins/smiley/images/embarrassed_smile.gif
  37. BIN plugins/smiley/images/embarrassed_smile.png
  38. BIN plugins/smiley/images/envelope.gif
  39. BIN plugins/smiley/images/envelope.png
  40. BIN plugins/smiley/images/heart.gif
  41. BIN plugins/smiley/images/heart.png
  42. BIN plugins/smiley/images/kiss.gif
  43. BIN plugins/smiley/images/kiss.png
  44. BIN plugins/smiley/images/lightbulb.gif
  45. BIN plugins/smiley/images/lightbulb.png
  46. BIN plugins/smiley/images/omg_smile.gif
  47. BIN plugins/smiley/images/omg_smile.png
  48. BIN plugins/smiley/images/regular_smile.gif
  49. BIN plugins/smiley/images/regular_smile.png
  50. BIN plugins/smiley/images/sad_smile.gif
  51. BIN plugins/smiley/images/sad_smile.png
  52. BIN plugins/smiley/images/shades_smile.gif
  53. BIN plugins/smiley/images/shades_smile.png
  54. BIN plugins/smiley/images/teeth_smile.gif
  55. BIN plugins/smiley/images/teeth_smile.png
  56. BIN plugins/smiley/images/thumbs_down.gif
  57. BIN plugins/smiley/images/thumbs_down.png
  58. BIN plugins/smiley/images/thumbs_up.gif
  59. BIN plugins/smiley/images/thumbs_up.png
  60. BIN plugins/smiley/images/tongue_smile.gif
  61. BIN plugins/smiley/images/tongue_smile.png
  62. BIN plugins/smiley/images/tounge_smile.gif
  63. BIN plugins/smiley/images/whatchutalkingabout_smile.gif
  64. BIN plugins/smiley/images/whatchutalkingabout_smile.png
  65. BIN plugins/smiley/images/wink_smile.gif
  66. BIN plugins/smiley/images/wink_smile.png
  67. BIN plugins/widget/images/handle.png
  68. BIN samples/assets/inlineall/logo.png
  69. BIN samples/assets/sample.jpg
  70. BIN skins/kama/images/dialog_sides.gif
  71. BIN skins/kama/images/dialog_sides.png
  72. BIN skins/kama/images/dialog_sides_rtl.png
  73. BIN skins/kama/images/mini.gif
  74. BIN skins/kama/images/sprites.png
  75. BIN skins/kama/images/sprites_ie6.png
  76. BIN skins/kama/images/toolbar_start.gif
  77. BIN skins/moono/images/arrow.png
  78. BIN skins/moono/images/close.png
  79. BIN skins/moono/images/hidpi/close.png
  80. BIN skins/moono/images/hidpi/lock-open.png
  81. BIN skins/moono/images/hidpi/lock.png
  82. BIN skins/moono/images/hidpi/refresh.png
  83. BIN skins/moono/images/lock-open.png
  84. BIN skins/moono/images/lock.png
  85. BIN skins/moono/images/refresh.png
@@ -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

@@ -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' ] );
};
@@ -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"
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN -174 Bytes (77%) plugins/link/images/anchor.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN -39 Bytes (77%) plugins/magicline/images/icon.png
Binary file not shown.
BIN -253 Bytes (76%) plugins/mathjax/images/loader.gif
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
BIN -206 Bytes (71%) plugins/smiley/images/envelope.gif
Diff not rendered.
BIN -289 Bytes (72%) plugins/smiley/images/envelope.png
Diff not rendered.
BIN -399 Bytes (63%) plugins/smiley/images/heart.gif
Diff not rendered.
BIN -74 Bytes (93%) plugins/smiley/images/heart.png
Diff not rendered.
BIN -399 Bytes (63%) plugins/smiley/images/kiss.gif
Diff not rendered.
BIN -74 Bytes (93%) plugins/smiley/images/kiss.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
BIN -125 Bytes (64%) plugins/widget/images/handle.png
Diff not rendered.
BIN -128 Bytes (97%) samples/assets/inlineall/logo.png
Diff not rendered.
BIN -3.4 KB (81%) samples/assets/sample.jpg
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
BIN -2 Bytes (99%) skins/kama/images/mini.gif
Diff not rendered.
BIN -969 Bytes (86%) skins/kama/images/sprites.png
Diff not rendered.
BIN -66 Bytes (98%) skins/kama/images/sprites_ie6.png
Diff not rendered.
Diff not rendered.
BIN -70 Bytes (73%) skins/moono/images/arrow.png
Diff not rendered.
BIN -356 Bytes (57%) skins/moono/images/close.png
Diff not rendered.
BIN -521 Bytes (71%) skins/moono/images/hidpi/close.png
Diff not rendered.
Diff not rendered.
BIN -317 Bytes (80%) skins/moono/images/hidpi/lock.png
Diff not rendered.
Diff not rendered.
BIN -387 Bytes (47%) skins/moono/images/lock-open.png
Diff not rendered.
BIN -253 Bytes (65%) skins/moono/images/lock.png
Diff not rendered.
BIN -531 Bytes (44%) skins/moono/images/refresh.png
Diff not rendered.

0 comments on commit 590deeb

Please sign in to comment.
You can’t perform that action at this time.