diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-07-11 15:26:48 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-07-11 15:27:24 -0700 |
| commit | b71f4c216fbe725af0b81ca42ab628d0f596b5a0 (patch) | |
| tree | be4e134b362e93d053c43f2a01378e8d0f18c3dd /httemplate/elements/ckeditor/plugins/templates/dialogs | |
| parent | 8fa3f46d3da1d2cb4b9ca47b642df40bc8fc8ba8 (diff) | |
update CKeditor
Diffstat (limited to 'httemplate/elements/ckeditor/plugins/templates/dialogs')
| -rw-r--r-- | httemplate/elements/ckeditor/plugins/templates/dialogs/templates.css | 14 | ||||
| -rw-r--r-- | httemplate/elements/ckeditor/plugins/templates/dialogs/templates.js | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/httemplate/elements/ckeditor/plugins/templates/dialogs/templates.css b/httemplate/elements/ckeditor/plugins/templates/dialogs/templates.css index e226d7974..7fc4a1bc4 100644 --- a/httemplate/elements/ckeditor/plugins/templates/dialogs/templates.css +++ b/httemplate/elements/ckeditor/plugins/templates/dialogs/templates.css @@ -1,6 +1,6 @@ /*
-Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.html or http://ckeditor.com/license
+Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
*/
.cke_tpl_list
@@ -61,11 +61,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license cursor: pointer;
}
-/* IE6 contextual selectors childs won't get :hover transition until,
- the hover style of the link itself contains certain CSS declarations.*/
-.cke_browser_ie6 .cke_tpl_list a:active,
-.cke_browser_ie6 .cke_tpl_list a:hover,
-.cke_browser_ie6 .cke_tpl_list a:focus
+/* IE Quirks contextual selectors children will not get :hover transition until
+ the hover style of the link itself contains certain CSS declarations. */
+.cke_browser_quirks .cke_tpl_list a:active,
+.cke_browser_quirks .cke_tpl_list a:hover,
+.cke_browser_quirks .cke_tpl_list a:focus
{
background-position: 0 0;
}
diff --git a/httemplate/elements/ckeditor/plugins/templates/dialogs/templates.js b/httemplate/elements/ckeditor/plugins/templates/dialogs/templates.js index 390fdb61d..ee1a252e4 100644 --- a/httemplate/elements/ckeditor/plugins/templates/dialogs/templates.js +++ b/httemplate/elements/ckeditor/plugins/templates/dialogs/templates.js @@ -1,6 +1,6 @@ /* - Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved. - For licensing, see LICENSE.html or http://ckeditor.com/license + Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. + For licensing, see LICENSE.md or http://ckeditor.com/license */ (function(){CKEDITOR.dialog.add("templates",function(c){function o(a,b){var k=CKEDITOR.dom.element.createFromHtml('<a href="javascript:void(0)" tabIndex="-1" role="option" ><div class="cke_tpl_item"></div></a>'),d='<table style="width:350px;" class="cke_tpl_preview" role="presentation"><tr>';a.image&&b&&(d+='<td class="cke_tpl_preview_img"><img src="'+CKEDITOR.getUrl(b+a.image)+'"'+(CKEDITOR.env.ie6Compat?' onload="this.width=this.width"':"")+' alt="" title=""></td>');d+='<td style="white-space:normal;"><span class="cke_tpl_title">'+ a.title+"</span><br/>";a.description&&(d+="<span>"+a.description+"</span>");k.getFirst().setHtml(d+"</td></tr></table>");k.on("click",function(){p(a.html)});return k}function p(a){var b=CKEDITOR.dialog.getCurrent();b.getValueOf("selectTpl","chkInsertOpt")?(c.fire("saveSnapshot"),c.setData(a,function(){b.hide();var a=c.createRange();a.moveToElementEditStart(c.editable());a.select();setTimeout(function(){c.fire("saveSnapshot")},0)})):(c.insertHtml(a),b.hide())}function i(a){var b=a.data.getTarget(), |
