Skip to content
Permalink
Browse files

Merge branch 't/9633'

  • Loading branch information...
Reinmar committed Nov 16, 2012
2 parents a7caa20 + 7d5efc4 commit 3592a8eed9483ae4763d3cba6498f7dca0d49053
@@ -142,7 +142,8 @@
],
[
'about',
'uicolor'
'uicolor',
'placeholder'
]
]

@@ -113,7 +113,7 @@ CKEDITOR.plugins.add( 'menu', {
menuItemSource +=
'<span class="cke_menubutton_inner">' +
'<span class="cke_menubutton_icon">' +
'<span class="cke_button_icon cke_button__{name}_icon" style="{iconStyle}"></span>' +
'<span class="cke_button_icon cke_button__{iconName}_icon" style="{iconStyle}"></span>' +
'</span>' +
'<span class="cke_menubutton_label">' +
'{label}' +
@@ -431,9 +431,14 @@ CKEDITOR.plugins.add( 'menu', {
// rtl: BLACK RIGHT-POINTING POINTER
var arrowLabel = '&#' + ( this.editor.lang.dir == 'rtl' ? '9668' : '9658' ) + ';';

var iconName = this.name;
if ( this.icon && !( /\./ ).test( this.icon ) )
iconName = this.icon;

var params = {
id: id,
name: this.name,
iconName: iconName,
label: this.label,
cls: this.className || '',
state: stateName,
@@ -446,7 +451,7 @@ CKEDITOR.plugins.add( 'menu', {
moveOutFn: menu._.itemOutFn,
clickFn: menu._.itemClickFn,
index: index,
iconStyle: CKEDITOR.skin.getIconStyle( this.name, ( this.editor.lang.dir == 'rtl' ), this.icon, this.iconOffset ),
iconStyle: CKEDITOR.skin.getIconStyle( iconName, ( this.editor.lang.dir == 'rtl' ), iconName == this.icon ? null : this.icon, this.iconOffset ),
arrowHtml: hasSubMenu ? menuArrowTpl.output({ label: arrowLabel } ) : ''
};

Binary file not shown.
Binary file not shown.
@@ -13,7 +13,7 @@
CKEDITOR.plugins.add( 'placeholder', {
requires: 'dialog',
lang: 'en,bg,cs,cy,da,de,el,eo,et,fa,fi,fr,he,hr,it,nb,nl,no,pl,tr,ug,uk,vi,zh-cn', // %REMOVE_LINE_CORE%
icons: 'createplaceholder,editplaceholder', // %REMOVE_LINE_CORE%
icons: 'placeholder', // %REMOVE_LINE_CORE%
onLoad: function() {
CKEDITOR.addCss( '.cke_placeholder' +
'{' +
@@ -31,7 +31,8 @@
editor.ui.addButton && editor.ui.addButton( 'CreatePlaceholder', {
label: lang.toolbar,
command: 'createplaceholder',
toolbar: 'insert,5'
toolbar: 'insert,5',
icon: 'placeholder'
});

if ( editor.addMenuItems ) {
@@ -41,7 +42,8 @@
label: lang.edit,
command: 'editplaceholder',
group: 'placeholder',
order: 1
order: 1,
icon: 'placeholder'
}
});

File renamed without changes.
@@ -243,7 +243,7 @@ CKEDITOR.skin.chameleon = function( editor, part ) {
'indent,italic,justifyblock,justifycenter,justifyleft,justifyright,' +
'link,maximize,newpage-rtl,newpage,numberedlist-rtl,numberedlist,' +
'outdent-rtl,outdent,pagebreak-rtl,pagebreak,paste-rtl,paste,' +
'pastefromword-rtl,pastefromword,pastetext-rtl,pastetext,preview-rtl,' +
'pastefromword-rtl,pastefromword,pastetext-rtl,pastetext,placeholder,preview-rtl,' +
'preview,print,radio,redo-rtl,redo,removeformat,replace,save,scayt,' +
'select-rtl,select,selectall,showblocks-rtl,showblocks,smiley,' +
'source-rtl,source,specialchar,spellchecker,strike,subscript,' +
@@ -978,7 +978,70 @@
x1="365"
y1="73.073685"
x2="365"
y2="84.073685" /></defs><sodipodi:namedview
y2="84.073685" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4392"
id="linearGradient4386"
x1="73"
y1="321"
x2="73"
y2="335"
gradientUnits="userSpaceOnUse" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4392"
id="linearGradient4388"
x1="69"
y1="323"
x2="69"
y2="333"
gradientUnits="userSpaceOnUse" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4392-3"
id="linearGradient4386-0"
x1="73"
y1="321"
x2="73"
y2="335"
gradientUnits="userSpaceOnUse" /><linearGradient
id="linearGradient4392-3"><stop
style="stop-color:#666666;stop-opacity:1;"
offset="0"
id="stop4394-6" /><stop
style="stop-color:#424242;stop-opacity:1;"
offset="1"
id="stop4396-8" /></linearGradient><filter
id="filter3224-1-7-1-2-7"
inkscape:label="Inner Shadow"
inkscape:menu="Shadows and Glows"
inkscape:menu-tooltip="Adds a colorizable drop shadow inside"
color-interpolation-filters="sRGB"
width="1"
height="1"
y="0"
x="0"><feOffset
id="feOffset3228-5-5-5-0-0"
dx="0"
dy="1"
result="result11" /><feComposite
id="feComposite3230-2-4-1-5-5"
in2="result11"
result="result6"
in="SourceGraphic"
operator="in" /><feFlood
id="feFlood3232-7-3-4-1-0"
result="result10"
in="result6"
flood-opacity="1"
flood-color="rgb(34,34,34)" /><feBlend
id="feBlend3234-6-3-5-8-2"
in2="result10"
mode="normal"
in="result6"
result="result12" /><feComposite
id="feComposite3236-1-3-5-5-1"
in2="SourceGraphic"
result="result2"
operator="in" /></filter></defs><sodipodi:namedview
pagecolor="#dddddd"
bordercolor="#666666"
borderopacity="1"
@@ -990,11 +1053,11 @@
inkscape:window-width="1680"
inkscape:window-height="1026"
id="namedview5"
showgrid="true"
showgrid="false"
inkscape:showpageshadow="false"
inkscape:zoom="1"
inkscape:cx="368.95191"
inkscape:cy="93.040045"
inkscape:zoom="11.390625"
inkscape:cx="78.76423"
inkscape:cy="9.4257293"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="1"
@@ -1136,19 +1199,44 @@
d="m 104.21875,131 c -1.3937,1e-5 -2.47545,0.28684 -3.21875,0.90625 -0.7433,0.61943 -1.093752,1.50517 -1.09375,2.65625 -2e-6,0.91881 0.24958,1.67676 0.78125,2.21875 0.0797,0.0804 0.18796,0.14481 0.28125,0.21875 L 98.5,137 c -0.277,0 -0.5,0.18355 -0.5,0.4375 l 0,0.0937 C 98,137.78516 98.223,138 98.5,138 l 5,0 0.875,0.21875 c 0.70201,0.15486 1.17396,0.30385 1.40625,0.5 0.23744,0.19615 0.37499,0.48242 0.375,0.84375 -1e-5,0.40262 -0.18542,0.7207 -0.53125,0.9375 -0.34585,0.2168 -0.84961,0.3125 -1.5,0.3125 -0.64007,0 -1.30832,-0.0851 -2,-0.28125 -0.68653,-0.20131 -1.38686,-0.51394 -2.125,-0.90625 l 0,2.53125 c 0.73814,0.27358 1.4806,0.48563 2.21875,0.625 0.73814,0.13935 1.45451,0.21875 2.1875,0.21875 1.5537,0 2.71511,-0.31808 3.46875,-0.9375 0.75878,-0.62458 1.15624,-1.56877 1.15625,-2.84375 0,-0.44811 -0.0719,-0.8653 -0.1875,-1.21875 l 1.65625,0 c 0.277,0 0.5,-0.2148 0.5,-0.46875 l 0,-0.0937 C 111,137.18359 110.777,137 110.5,137 l -2.25,0 c -0.0105,-0.0105 -0.0206,-0.0209 -0.0312,-0.0312 -0.542,-0.5265 -1.46471,-0.9294 -2.75,-1.1875 l -1.28125,-0.25 c -0.60393,-0.12388 -1.01772,-0.26715 -1.25,-0.4375 -0.22713,-0.17549 -0.34376,-0.44028 -0.34375,-0.75 -1e-5,-0.41294 0.19056,-0.71009 0.53125,-0.90625 0.34068,-0.19613 0.85016,-0.28124 1.5625,-0.28125 0.53683,1e-5 1.11481,0.0742 1.71875,0.21875 0.60393,0.14454 0.99009,0.34111 1.625,0.625 l 0,-2.46875 c -0.7175,-0.19098 -1.17272,-0.31335 -1.84375,-0.40625 -0.67104,-0.0981 -1.33385,-0.12499 -1.96875,-0.125 z"
transform="translate(0,-1e-5)"
id="path3568-3"
inkscape:connector-curvature="0" /></g><g
inkscape:connector-curvature="0" /><path
style="opacity:0.98999999;fill:#ffffff;fill-opacity:1;stroke:none;display:inline"
d="m 64,321.99999 0,14 3,0 0,-1 -2,0 0,-12 2,0 0,-1 z m 13,0 0,1 2,0 0,12 -2,0 0,1 3,0 0,-14 z"
id="rect3578-3"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccccccccc" /></g><g
inkscape:groupmode="layer"
id="layer3"
inkscape:label="Icons"
style="opacity:0.98999999;display:inline"><path
style="opacity:0.98999999;display:inline"><rect
y="321"
x="68"
height="14.00004"
width="8"
id="rect4452"
style="fill:#cccccc;fill-opacity:1;stroke:none" /><rect
style="fill:#cccccc;fill-opacity:1;stroke:none"
id="rect4367"
width="12"
height="10.000055"
x="66"
y="323" /><g
id="g4363"
style="font-size:13.71140385px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#676767;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;font-family:Sans"
transform="translate(1,0)"><path
sodipodi:nodetypes="csssccccccsssc"
inkscape:connector-curvature="0"
id="path4365"
style="font-variant:normal;font-weight:bold;font-stretch:normal;fill:#676767;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;font-family:Nimbus Sans L;-inkscape-font-specification:Nimbus Sans L Bold"
d="m 70.006423,329.43503 1.991763,0 c 1.837326,0 3.016509,-1.30258 3.016509,-3.33187 0,-2.00186 -1.138049,-3.09877 -3.22218,-3.09877 l -3.790777,0 0,9.99561 2.004685,0 0,-3.56497 m 0,-1.71392 0,-3.0028 1.347327,0 c 1.096911,0 1.604234,0.4799 1.604234,1.50826 0,1.01464 -0.507323,1.49454 -1.604234,1.49454 l -1.347327,0" /></g><path
style="fill:url(#linearGradient4406);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
d="m 358.5,321.59374 c -0.79075,0.009 -1.60031,0.34033 -2.5,1.375 l 0,7 0,0.25 0,0.75 0,0.0312 c 0.22508,-0.25367 0.43768,-0.45147 0.65625,-0.625 0.18735,-0.14874 0.37931,-0.27793 0.5625,-0.375 0.0624,-0.0331 0.12551,-0.0662 0.1875,-0.0937 0.0832,-0.035 0.16738,-0.0679 0.25,-0.0937 0.0314,-0.0105 0.0624,-0.0221 0.0937,-0.0312 0.0824,-0.0228 0.16846,-0.047 0.25,-0.0625 0.009,10e-4 0.0222,-10e-4 0.0312,0 0.17684,-0.0316 0.35709,-0.0655 0.53125,-0.0625 1.36919,0.0236 2.67349,0.99995 4.03125,1.375 0.20073,0.0554 0.38983,0.1016 0.59375,0.125 0.0652,0.007 0.12196,0.0277 0.1875,0.0312 0.0591,0.003 0.12808,3.1e-4 0.1875,0 0.028,0.004 0.0652,8.2e-4 0.0937,0 0.0532,-0.002 0.10326,-0.0244 0.15625,-0.0312 0.0415,-0.005 0.0829,0.005 0.125,0 0.0301,-0.004 0.0636,0.005 0.0937,0 0.0961,-0.0161 0.18405,-0.0665 0.28125,-0.0937 0.16842,-0.0473 0.32806,-0.10258 0.5,-0.1875 0.0298,-0.0141 0.0637,-0.0155 0.0937,-0.0312 0.015,-0.008 0.0175,-0.0197 0.0312,-0.0312 0.0138,-0.0116 0.0161,-0.0229 0.0312,-0.0312 0.16236,-0.0914 0.33405,-0.18218 0.5,-0.3125 0.0109,-0.009 0.0203,-0.0225 0.0312,-0.0312 0.16802,-0.13283 0.32813,-0.25969 0.5,-0.4375 l 0,-0.0312 0,-1 0,-6 0,-1 c -0.15402,0.16401 -0.31736,0.31409 -0.46875,0.4375 -0.0109,0.009 -0.0203,0.0224 -0.0312,0.0312 -0.13895,0.11076 -0.26887,0.19638 -0.40625,0.28125 -0.0367,0.0227 -0.0884,0.0417 -0.125,0.0625 -0.33321,0.18959 -0.64527,0.29368 -0.96875,0.34375 -1.94086,0.30044 -3.7208,-1.55267 -5.5,-1.53125 z m -4.5,0.40625 0,13 1,0 0,-13 -1,0 z"
id="path3613"
inkscape:connector-curvature="0"
inkscape:export-filename="/home/oleq/ck/ckeditor-dev/plugins/link/images/anchor.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" /><rect
style="fill:#ffffff;fill-opacity:0;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
style="fill:#ffffff;fill-opacity:0;stroke:none"
id="rect4382"
width="16"
height="16"
@@ -1817,7 +1905,7 @@
height="16"
width="16"
id="rect3598"
style="fill:#ffffff;fill-opacity:0;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
style="fill:#ffffff;fill-opacity:0;stroke:none"
transform="translate(0,-1e-5)" /><path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
@@ -1848,4 +1936,18 @@
inkscape:export-filename="/home/oleq/ck/ckeditor-dev/plugins/link/images/anchor.png"
id="path3606"
d="m 366,321.96874 c -0.30805,0.32801 -0.61008,0.56529 -0.90909,0.75 l 0,7 c -2.37556,1.46746 -4.48386,-1.15037 -6.59091,-1.125 -0.79075,0.009 -1.60031,0.34033 -2.5,1.375 l 0,0.25 0,0.75 0,0.0312 c 0.17642,-0.19882 0.34007,-0.3831 0.51136,-0.53125 0.17129,-0.14815 0.34405,-0.27195 0.51137,-0.375 0.33463,-0.2061 0.66866,-0.31581 0.99432,-0.375 -0.0646,-0.009 -0.13201,-0.0172 -0.19887,-0.0312 0.22905,-0.0632 0.45744,-0.0912 0.68182,-0.0937 1.52669,-0.0184 3.05867,1.36143 4.6875,1.5625 0.0643,0.008 0.13429,-0.004 0.19886,0 0.086,0.005 0.16893,0.0337 0.25569,0.0312 0.0948,-0.003 0.18827,-0.0188 0.28409,-0.0312 0.13088,-0.017 0.26485,-0.0564 0.39772,-0.0937 0.18899,-0.0529 0.37588,-0.1176 0.56819,-0.21875 0.0301,-0.0155 0.055,-0.0457 0.0852,-0.0625 0.16982,-0.0943 0.33776,-0.20651 0.51137,-0.34375 0.16802,-0.13283 0.33949,-0.25969 0.51136,-0.4375 l 0,-0.0312 0,-1 0,-7 z"
style="fill:#8e0000;fill-opacity:1;fill-rule:evenodd" /></g></svg>
style="fill:#8e0000;fill-opacity:1;fill-rule:evenodd" /><path
style="fill:url(#linearGradient4386);fill-opacity:1;stroke:none;filter:url(#filter3224-1-7-1-2)"
d="m 64,321 0,14 3,0 0,-1 -2,0 0,-12 2,0 0,-1 z m 13,0 0,1 2,0 0,12 -2,0 0,1 3,0 0,-14 z"
transform="translate(0,-1e-5)"
id="rect3578"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccccccccccccc" /><g
style="font-size:13.71140385px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient4388);fill-opacity:1;stroke:none;filter:url(#filter3224-1-7-1-2);font-family:Sans"
id="text4354"
transform="translate(1,0)"><path
d="m 70.006423,329.43503 1.991763,0 c 1.837326,0 3.016509,-1.30258 3.016509,-3.33187 0,-2.00186 -1.138049,-3.09877 -3.22218,-3.09877 l -3.790777,0 0,9.99561 2.004685,0 0,-3.56497 m 0,-1.71392 0,-3.0028 1.347327,0 c 1.096911,0 1.604234,0.4799 1.604234,1.50826 0,1.01464 -0.507323,1.49454 -1.604234,1.49454 l -1.347327,0"
style="font-variant:normal;font-weight:bold;font-stretch:normal;fill:url(#linearGradient4388);font-family:Nimbus Sans L;-inkscape-font-specification:Nimbus Sans L Bold"
id="path4361"
inkscape:connector-curvature="0"
sodipodi:nodetypes="csssccccccsssc" /></g></g></svg>
BIN +844 Bytes (100%) skins/moono/dev/icons_export_16.png
Binary file not shown.

0 comments on commit 3592a8e

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