Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 't/11066' into major
  • Loading branch information
Piotr Jasiun committed Nov 5, 2013
2 parents e37b814 + 1ae4eb6 commit 105a1dc
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGES.md
Expand Up @@ -5,6 +5,7 @@ CKEditor 4 Changelog

New Features:

* [#11066](http://dev.ckeditor.com/ticket/11066): Widget's private parts uses CSS reset.
* [#11027](http://dev.ckeditor.com/ticket/11027): Fixed block commands break on widget issue; added contentDomInvalidated event.
* [#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.
Expand Down
14 changes: 9 additions & 5 deletions plugins/widget/plugin.js
Expand Up @@ -54,14 +54,18 @@
'opacity:1' +
'}'+
'img.cke_widget_drag_handler{' +
'cursor:move' +
'cursor:move;' +
'width:' + DRAG_HANDLER_SIZE + 'px;' +
'height:' + DRAG_HANDLER_SIZE + 'px;' +
'display:block' +
'}' +
'.cke_widget_mask{' +
'position:absolute;' +
'top:0;' +
'left:0;' +
'width:100%;' +
'height:100%' +
'height:100%;' +
'display:block' +
'}'
);
},
Expand Down Expand Up @@ -2389,14 +2393,14 @@
container = new CKEDITOR.dom.element( 'span', editor.document );

container.setAttributes( {
'class': 'cke_widget_drag_handler_container',
'class': 'cke_reset cke_widget_drag_handler_container',
// Split background and background-image for IE8 which will break on rgba().
style: 'background:rgba(220,220,220,0.5);background-image:url(' + editor.plugins.widget.path + 'images/handle.png)'
} );

img.setAttributes( {
draggable: 'true',
'class': 'cke_widget_drag_handler',
'class': 'cke_reset cke_widget_drag_handler',
'data-cke-widget-drag-handler': '1',
src: transparentImageData,
width: DRAG_HANDLER_SIZE,
Expand Down Expand Up @@ -2436,7 +2440,7 @@
var img = new CKEDITOR.dom.element( 'img', widget.editor.document );
img.setAttributes( {
src: transparentImageData,
'class': 'cke_widget_mask'
'class': 'cke_reset cke_widget_mask'
} );
widget.wrapper.append( img );
widget.mask = img;
Expand Down
10 changes: 10 additions & 0 deletions skins/kama/reset.css
Expand Up @@ -38,6 +38,11 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
box-sizing: content-box;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
position: static;
-webkit-transition: none;
-moz-transition: none;
-ms-transition: none;
transition: none;
}

/* Reset for elements and their children. */
Expand All @@ -55,6 +60,11 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
box-sizing: content-box;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
position: static;
-webkit-transition: none;
-moz-transition: none;
-ms-transition: none;
transition: none;

/* These are rule inherited by all children elements. */
border-collapse: collapse;
Expand Down
10 changes: 10 additions & 0 deletions skins/moono/reset.css
Expand Up @@ -38,6 +38,11 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
box-sizing: content-box;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
position: static;
-webkit-transition: none;
-moz-transition: none;
-ms-transition: none;
transition: none;
}

/* Reset for elements and their children. */
Expand All @@ -55,6 +60,11 @@ http://docs.cksource.com/CKEditor_4.x/Skin_SDK/Reset
box-sizing: content-box;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
position: static;
-webkit-transition: none;
-moz-transition: none;
-ms-transition: none;
transition: none;

/* These are rule inherited by all children elements. */
border-collapse: collapse;
Expand Down

0 comments on commit 105a1dc

Please sign in to comment.