Skip to content
Permalink
Browse files

Merge branch 't/9629'

  • Loading branch information...
oleq committed Nov 15, 2012
2 parents 7b24a16 + 7cac13b commit 00002fe1426b6c06c0de2790acbf9a7233a4e23d
Binary file not shown.
Binary file not shown.
@@ -9,7 +9,7 @@ CKEDITOR.plugins.add( 'link', {
icons: 'anchor,anchor-rtl,link,unlink', // %REMOVE_LINE_CORE%
onLoad: function() {
// Add the CSS styles for anchor placeholders.
var baseStyle = 'background:url(' + CKEDITOR.getUrl( this.path + 'images/anchor.gif' ) + ') no-repeat %1 center;' +
var baseStyle = 'background:url(' + CKEDITOR.getUrl( this.path + 'images/anchor.png' ) + ') no-repeat %1 center;' +
'border:1px dotted #00f;';

var template = '.%2 a.cke_anchor,' +
@@ -28,6 +28,20 @@
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs7"><linearGradient
inkscape:collect="always"
id="linearGradient4352"><stop
style="stop-color:#ff4141;stop-opacity:0"
offset="0"
id="stop4354" /><stop
id="stop4362"
offset="0.24227905"
style="stop-color:#ff4141;stop-opacity:0.78823529;" /><stop
id="stop4360"
offset="0.73632693"
style="stop-color:#ff4141;stop-opacity:0" /><stop
style="stop-color:#ff4141;stop-opacity:1"
offset="1"
id="stop4356" /></linearGradient><linearGradient
id="linearGradient4392"><stop
style="stop-color:#666666;stop-opacity:1;"
offset="0"
@@ -80,23 +94,7 @@
id="feComposite3236-1-3-5"
in2="SourceGraphic"
result="result2"
operator="in" /></filter><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4392-45"
id="linearGradient4654-1"
gradientUnits="userSpaceOnUse"
x1="263.14438"
y1="53.202732"
x2="263.14438"
y2="65.97139" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4392-45"
id="linearGradient3503-9"
x1="324.89481"
y1="49.999996"
x2="327.98953"
y2="61.999996"
gradientUnits="userSpaceOnUse" /><filter
operator="in" /></filter><filter
id="filter3224-1-7-1-3"
inkscape:label="Inner Shadow"
inkscape:menu="Shadows and Glows"
@@ -131,22 +129,6 @@
operator="in" /></filter><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4392-45"
id="linearGradient4057"
gradientUnits="userSpaceOnUse"
x1="324.89481"
y1="49.999996"
x2="327.98953"
y2="61.999996" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4392-45"
id="linearGradient4061"
gradientUnits="userSpaceOnUse"
x1="263.14438"
y1="53.202732"
x2="263.14438"
y2="65.97139" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4392-45"
id="linearGradient4838"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.33333,0,0,1.33333,47.36541,-272.06703)"
@@ -408,15 +390,6 @@
y2="108.07368" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4392-45"
id="linearGradient4896"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.2681238,0,0,1.2681238,-425.98997,135.51665)"
x1="342"
y1="97.073685"
x2="342"
y2="108.07368" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4392-45"
id="linearGradient4898"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(96,-204)"
@@ -860,15 +833,6 @@
y1="225"
x2="56"
y2="239" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4392-45-3"
id="linearGradient4765-0"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.2681238,0,0,1.2681238,-425.37554,133.95235)"
x1="342"
y1="97.073685"
x2="342"
y2="108.07368" /><linearGradient
id="linearGradient4392-45-3"><stop
style="stop-color:#666666;stop-opacity:1;"
offset="0"
@@ -951,98 +915,70 @@
x2="264"
y2="121"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(0,-14.00001)" /><filter
id="filter3224-1-7-1-0"
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-7"
dx="0"
dy="1"
result="result11" /><feComposite
id="feComposite3230-2-4-1-6"
in2="result11"
result="result6"
in="SourceGraphic"
operator="in" /><feFlood
id="feFlood3232-7-3-4-12"
result="result10"
in="result6"
flood-opacity="1"
flood-color="rgb(34,34,34)" /><feBlend
id="feBlend3234-6-3-5-3"
in2="result10"
mode="normal"
in="result6"
result="result12" /><feComposite
id="feComposite3236-1-3-5-7"
in2="SourceGraphic"
result="result2"
operator="in" /></filter><filter
id="filter3224-1-7-1-2-9"
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-8"
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-8"
result="result10"
in="result6"
flood-opacity="1"
flood-color="rgb(34,34,34)" /><feBlend
id="feBlend3234-6-3-5-8-0"
in2="result10"
mode="normal"
in="result6"
result="result12" /><feComposite
id="feComposite3236-1-3-5-5-6"
in2="SourceGraphic"
result="result2"
operator="in" /></filter><linearGradient
gradientTransform="translate(0,-14.00001)" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4392"
id="linearGradient3716"
xlink:href="#linearGradient4392-45"
id="linearGradient3576"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(143,76.99999)"
x1="56"
y1="225"
x2="56"
y2="239" /><linearGradient
gradientTransform="matrix(1.33333,0,0,1.33333,-127.467,222.82271)"
x1="365"
y1="73.073685"
x2="365"
y2="84.073685" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4392"
id="linearGradient3720"
xlink:href="#linearGradient4352"
id="linearGradient4358"
x1="366.95544"
y1="335.06354"
x2="356.00427"
y2="335.08957"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(100,75.99999)"
x1="56"
y1="225"
x2="56"
y2="239" /><linearGradient
gradientTransform="matrix(0.90909091,0,0,1,32.363636,-9)" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4392"
id="linearGradient3732"
xlink:href="#linearGradient4392-45"
id="linearGradient3629"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(116,77.99999)"
x1="56"
y1="225"
x2="56"
y2="239" /></defs><sodipodi:namedview
gradientTransform="matrix(1.33333,0,0,1.33333,-127.467,242.82272)"
x1="365"
y1="73.073685"
x2="365"
y2="84.073685" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4352"
id="linearGradient3631"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.90909091,0,0,1,32.363636,11)"
x1="366.95544"
y1="335.06354"
x2="356.00427"
y2="335.08957" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4392-45"
id="linearGradient3633"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.33333,0,0,1.33333,-127.467,242.82271)"
x1="365"
y1="73.073685"
x2="365"
y2="84.073685" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4352"
id="linearGradient3635"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.90909091,0,0,1,32.363636,11)"
x1="366.95544"
y1="335.06354"
x2="356.00427"
y2="335.08957" /><linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4392-45"
id="linearGradient4406"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.33333,0,0,1.33333,-127.467,222.82271)"
x1="365"
y1="73.073685"
x2="365"
y2="84.073685" /></defs><sodipodi:namedview
pagecolor="#dddddd"
bordercolor="#666666"
borderopacity="1"
@@ -1051,17 +987,17 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1142"
inkscape:window-height="753"
inkscape:window-width="1680"
inkscape:window-height="1026"
id="namedview5"
showgrid="false"
showgrid="true"
inkscape:showpageshadow="false"
inkscape:zoom="1"
inkscape:cx="219.92346"
inkscape:cy="119.36914"
inkscape:window-x="190"
inkscape:window-y="112"
inkscape:window-maximized="0"
inkscape:cx="368.95191"
inkscape:cy="93.040045"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="1"
inkscape:current-layer="layer3"
fit-margin-top="0"
fit-margin-left="0"
@@ -1205,6 +1141,23 @@
id="layer3"
inkscape:label="Icons"
style="opacity:0.98999999;display:inline"><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"
id="rect4382"
width="16"
height="16"
x="352"
y="320"
transform="translate(0,-1e-5)"
inkscape:export-filename="/home/oleq/ck/ckeditor-dev/plugins/link/images/anchor.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" /><path
style="fill:#b8b8b8;fill-opacity:1;stroke:none"
d="m 64,63.99999 0,15 5,0 0,-1.153846 0,-1.153846 0,-1.692308 5,-0.153846 0,1.153846 5,0 0,-12 z"
id="rect6534"
@@ -1825,4 +1778,74 @@
d="m 98.5,136 12,0 c 0.277,0 0.5,0.20442 0.5,0.45833 l 0,0.0833 C 111,136.79558 110.777,137 110.5,137 l -12,0 c -0.277,0 -0.5,-0.20442 -0.5,-0.45833 l 0,-0.0833 C 98,136.20442 98.223,136 98.5,136 z"
style="fill:#2d2d2d;fill-opacity:1;stroke:none;filter:url(#filter3224-1-7-1)"
inkscape:connector-curvature="0"
sodipodi:nodetypes="sssssssss" /></g></svg>
sodipodi:nodetypes="sssssssss" /><path
style="fill:url(#linearGradient3576);fill-opacity:1;fill-rule:evenodd;filter:url(#filter3224-1-7-1)"
d="m 354,322 0,13 1,0 0,-13 z"
id="path3580"
inkscape:export-filename="/home/oleq/ck/ckeditor-dev/plugins/link/images/anchor.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" /><path
style="fill:#b50000;fill-opacity:1;fill-rule:evenodd"
d="m 358.49999,321.58336 c -0.79075,0.009 -1.6003,0.34033 -2.49999,1.375 L 356,331 c 3.6012,-4.05865 6.31153,2.81598 10,-1 l 0,-8.04165 c -2.75545,2.934 -5.12774,-0.40352 -7.50001,-0.37496 z"
id="path3574"
inkscape:export-filename="/home/oleq/ck/ckeditor-dev/plugins/link/images/anchor.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
inkscape:connector-curvature="0" /><path
id="path4350"
d="m 358.49999,322.58336 c -0.79075,0.009 -1.6003,0.34033 -2.49999,1.375 L 356,331 c 3.6012,-4.05865 6.31153,2.81598 10,-1 l 0,-7.04165 c -2.75545,2.934 -5.12774,-0.40352 -7.50001,-0.37496 z"
style="fill:url(#linearGradient4358);fill-opacity:1;fill-rule:evenodd"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc"
inkscape:export-filename="/home/oleq/ck/ckeditor-dev/plugins/link/images/anchor.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" /><path
style="fill:#8e0000;fill-opacity:1;fill-rule:evenodd"
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"
id="path4364"
inkscape:export-filename="/home/oleq/ck/ckeditor-dev/plugins/link/images/anchor.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
inkscape:connector-curvature="0" /><rect
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="/home/oleq/ck/ckeditor-dev/plugins/link/images/anchor.png"
y="320"
x="352"
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"
transform="translate(0,-1e-5)" /><path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="/home/oleq/ck/ckeditor-dev/plugins/link/images/anchor.png"
id="path3600"
d="m 354,322 0,13 1,0 0,-13 z"
style="fill:url(#linearGradient3576);fill-opacity:1;fill-rule:evenodd;filter:url(#filter3224-1-7-1)" /><path
inkscape:connector-curvature="0"
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="/home/oleq/ck/ckeditor-dev/plugins/link/images/anchor.png"
id="path3602"
d="m 358.49999,321.58336 c -0.79075,0.009 -1.6003,0.34033 -2.49999,1.375 L 356,331 c 3.6012,-4.05865 6.31153,2.81598 10,-1 l 0,-8.04165 c -2.75545,2.934 -5.12774,-0.40352 -7.50001,-0.37496 z"
style="fill:#b50000;fill-opacity:1;fill-rule:evenodd" /><path
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="/home/oleq/ck/ckeditor-dev/plugins/link/images/anchor.png"
sodipodi:nodetypes="ccccccc"
inkscape:connector-curvature="0"
style="fill:url(#linearGradient4358);fill-opacity:1;fill-rule:evenodd"
d="m 358.49999,322.58336 c -0.79075,0.009 -1.6003,0.34033 -2.49999,1.375 L 356,331 c 3.6012,-4.05865 6.31153,2.81598 10,-1 l 0,-7.04165 c -2.75545,2.934 -5.12774,-0.40352 -7.50001,-0.37496 z"
id="path3604" /><path
inkscape:connector-curvature="0"
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
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>

0 comments on commit 00002fe

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