Skip to content
Permalink
Browse files

Merge branch 't/10886' into major

  • Loading branch information...
mlewand committed Nov 4, 2013
2 parents d4f479a + e161a4f commit ea3a4dc28fb696e352dd7235b31c350adce52fe3
Showing with 10 additions and 0 deletions.
  1. +1 −0 CHANGES.md
  2. +7 −0 plugins/widget/lang/en.js
  3. +2 −0 plugins/widget/plugin.js
@@ -5,6 +5,7 @@ CKEditor 4 Changelog

New Features:

* [#10886](http://dev.ckeditor.com/ticket/10886): Widgets: added tooltip to the drag handler.
* [#10895](http://dev.ckeditor.com/ticket/10895): Image2: added support for server file browsers.
* [#11057](http://dev.ckeditor.com/ticket/11057): Fixed: Regression in #10212 test.
* [#10911](http://dev.ckeditor.com/ticket/10911): Browser alt hotkeys will no longer be blocked while widget is focused.
@@ -0,0 +1,7 @@
/**
* @license Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
CKEDITOR.plugins.setLang( 'widget', 'en', {
'move': 'Click and drag to move'
} );
@@ -14,6 +14,7 @@
var DRAG_HANDLER_SIZE = 14;

CKEDITOR.plugins.add( 'widget', {
lang: 'en', // %REMOVE_LINE_CORE%
onLoad: function() {
CKEDITOR.addCss(
'.cke_widget_wrapper{' +
@@ -2379,6 +2380,7 @@
'data-cke-widget-drag-handler': '1',
src: transparentImageData,
width: DRAG_HANDLER_SIZE,
title: editor.lang.widget.move,
height: DRAG_HANDLER_SIZE
} );

0 comments on commit ea3a4dc

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