diff --git a/core/COPYRIGHT.txt b/core/COPYRIGHT.txt
index 60b799e..4acb710 100644
--- a/core/COPYRIGHT.txt
+++ b/core/COPYRIGHT.txt
@@ -22,8 +22,6 @@ license, including:
Javascript
- Farbtastic - Copyright (c) 2010 Matt Farina
-
HTML5 Shiv - Copyright (c) 2012 Alexander Farkas, Jonathan Neal, Paul Irish,
and John-David Dalton
@@ -42,10 +40,10 @@ Javascript
jQuery Mousewheel - Copyright (c) 2010 Brandon Aaron
(http://brandonaaron.net)
- jQuery Metadata - Copyright (c) 2006 John Resig, Yehuda Katz, Jrn Zaefferer,
+ jQuery Metadata - Copyright (c) 2006 John Resig, Yehuda Katz, J�rn Zaefferer,
Paul McLanahan
- jQuery Once - Copyright (c) 2009 Konstantin Kfer
+ jQuery Once - Copyright (c) 2009 Konstantin K�fer
jQuery UI - Copyright (c) 2012 by the original authors
(http://jqueryui.com/about)
diff --git a/core/assets/vendor/farbtastic/farbtastic.css b/core/assets/vendor/farbtastic/farbtastic.css
deleted file mode 100644
index 25a68eb..0000000
--- a/core/assets/vendor/farbtastic/farbtastic.css
+++ /dev/null
@@ -1,36 +0,0 @@
-
-.farbtastic {
- position: relative;
-}
-.farbtastic * {
- position: absolute;
- cursor: crosshair;
-}
-.farbtastic,
-.farbtastic .wheel {
- width: 195px;
- height: 195px;
-}
-.farbtastic .color,
-.farbtastic .overlay {
- top: 47px;
- left: 47px;
- width: 101px;
- height: 101px;
-}
-.farbtastic .wheel {
- background: url(wheel.png) no-repeat;
- width: 195px;
- height: 195px;
-}
-.farbtastic .overlay {
- background: url(mask.png) no-repeat;
-}
-.farbtastic .marker {
- width: 17px;
- height: 17px;
- margin: -8px 0 0 -8px;
- overflow: hidden;
- background: url(marker.png) no-repeat;
-}
-
diff --git a/core/assets/vendor/farbtastic/farbtastic.js b/core/assets/vendor/farbtastic/farbtastic.js
deleted file mode 100644
index 10c9e76..0000000
--- a/core/assets/vendor/farbtastic/farbtastic.js
+++ /dev/null
@@ -1,8 +0,0 @@
-(function(e){e.fn.farbtastic=function(f){e.farbtastic(this,f);return this};e.farbtastic=function(f,l){f=e(f).get(0);return f.farbtastic||(f.farbtastic=new e._farbtastic(f,l))};e._farbtastic=function(f,l){var a=this;e(f).html('');var k=e(".farbtastic",f);a.wheel=e(".wheel",f).get(0);a.radius=84;a.square=100;a.width=194;navigator.appVersion.match(/MSIE [0-6]\./)&&
-e("*",k).each(function(){if(this.currentStyle.backgroundImage!="none"){var b=this.currentStyle.backgroundImage;b=this.currentStyle.backgroundImage.substring(5,b.length-2);e(this).css({backgroundImage:"none",filter:"progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod=crop, src='"+b+"')"})}});a.linkTo=function(b){typeof a.callback=="object"&&e(a.callback).unbind("keyup",a.updateValue);a.color=null;if(typeof b=="function")a.callback=b;else if(typeof b=="object"||typeof b=="string"){a.callback=
-e(b);a.callback.bind("keyup",a.updateValue);a.callback.get(0).value&&a.setColor(a.callback.get(0).value)}return this};a.updateValue=function(){this.value&&this.value!=a.color&&a.setColor(this.value)};a.setColor=function(b){var c=a.unpack(b);if(a.color!=b&&c){a.color=b;a.rgb=c;a.hsl=a.RGBToHSL(a.rgb);a.updateDisplay()}return this};a.setHSL=function(b){a.hsl=b;a.rgb=a.HSLToRGB(b);a.color=a.pack(a.rgb);a.updateDisplay();return this};a.widgetCoords=function(b){var c=e(a.wheel).offset();return{x:b.pageX-
-c.left-a.width/2,y:b.pageY-c.top-a.width/2}};a.mousedown=function(b){if(!document.dragging){e(document).bind("mousemove",a.mousemove).bind("mouseup",a.mouseup);document.dragging=true}var c=a.widgetCoords(b);a.circleDrag=Math.max(Math.abs(c.x),Math.abs(c.y))*2>a.square;a.mousemove(b);return false};a.mousemove=function(b){var c=a.widgetCoords(b);if(a.circleDrag){b=Math.atan2(c.x,-c.y)/6.28;if(b<0)b+=1;a.setHSL([b,a.hsl[1],a.hsl[2]])}else{b=Math.max(0,Math.min(1,-(c.x/a.square)+0.5));c=Math.max(0,Math.min(1,
--(c.y/a.square)+0.5));a.setHSL([a.hsl[0],b,c])}return false};a.mouseup=function(){e(document).unbind("mousemove",a.mousemove);e(document).unbind("mouseup",a.mouseup);document.dragging=false};a.updateDisplay=function(){var b=a.hsl[0]*6.28;e(".h-marker",k).css({left:Math.round(Math.sin(b)*a.radius+a.width/2)+"px",top:Math.round(-Math.cos(b)*a.radius+a.width/2)+"px"});e(".sl-marker",k).css({left:Math.round(a.square*(0.5-a.hsl[1])+a.width/2)+"px",top:Math.round(a.square*(0.5-a.hsl[2])+a.width/2)+"px"});
-e(".color",k).css("backgroundColor",a.pack(a.HSLToRGB([a.hsl[0],1,0.5])));if(typeof a.callback=="object"){e(a.callback).css({backgroundColor:a.color,color:a.hsl[2]>0.5?"#000":"#fff"});e(a.callback).each(function(){if(this.value&&this.value!=a.color)this.value=a.color})}else typeof a.callback=="function"&&a.callback.call(a,a.color)};a.pack=function(b){var c=Math.round(b[0]*255),d=Math.round(b[1]*255);b=Math.round(b[2]*255);return"#"+(c<16?"0":"")+c.toString(16)+(d<16?"0":"")+d.toString(16)+(b<16?"0":
-"")+b.toString(16)};a.unpack=function(b){if(b.length==7)return[parseInt("0x"+b.substring(1,3))/255,parseInt("0x"+b.substring(3,5))/255,parseInt("0x"+b.substring(5,7))/255];else if(b.length==4)return[parseInt("0x"+b.substring(1,2))/15,parseInt("0x"+b.substring(2,3))/15,parseInt("0x"+b.substring(3,4))/15]};a.HSLToRGB=function(b){var c,d=b[0];c=b[1];b=b[2];c=b<=0.5?b*(c+1):b+c-b*c;b=b*2-c;return[this.hueToRGB(b,c,d+0.33333),this.hueToRGB(b,c,d),this.hueToRGB(b,c,d-0.33333)]};a.hueToRGB=function(b,c,
-d){d=d<0?d+1:d>1?d-1:d;if(d*6<1)return b+(c-b)*d*6;if(d*2<1)return c;if(d*3<2)return b+(c-b)*(0.66666-d)*6;return b};a.RGBToHSL=function(b){var c,d,m,g,h=b[0],i=b[1],j=b[2];c=Math.min(h,Math.min(i,j));b=Math.max(h,Math.max(i,j));d=b-c;g=(c+b)/2;m=0;if(g>0&&g<1)m=d/(g<0.5?2*g:2-2*g);c=0;if(d>0){if(b==h&&b!=i)c+=(i-j)/d;if(b==i&&b!=j)c+=2+(j-h)/d;if(b==j&&b!=h)c+=4+(h-i)/d;c/=6}return[c,m,g]};e("*",k).mousedown(a.mousedown);a.setColor("#000000");l&&a.linkTo(l)}})(jQuery);
diff --git a/core/assets/vendor/farbtastic/marker.png b/core/assets/vendor/farbtastic/marker.png
deleted file mode 100644
index f9773d1..0000000
--- a/core/assets/vendor/farbtastic/marker.png
+++ /dev/null
@@ -1,5 +0,0 @@
-PNG
-
-
IHDR dq pHYs ." ."ݒ +tEXtCreation Time vr 14 jul 2006 13:31:23 +0100 Cg 0IDAT(+q zzB$Vf$R ppM. njR;-4r$nB]W&=OOp ]DIg~#L"QJLqyf568Fskئ>;mIJ|ahִdV4/Lvp cnd`±sVsɵǁD$h'=]as'BfOWd Leds(LGWHBרVFa ]W6Ev&xM ,8O1};Bc
-JvY_#eTW ʴd >*Q<ZL̛q)'5Y|=iWOYXѵ؋I0G
QW5ذD8F֊c(X%KIFu]ڲxZ&[Qp&NxCꚲy I%&JH#YtŖ˪'@zU%zI V%9 :' _2˂*%C',"#
-/a×gYVh˴d*,ߐ: YD}A8H#zr1*kwѰ%% ~T )
-C cUҰJaq|# ~!{hi~gxLdt#+{| ~#:̣)-QUU8VVː&A#;U=Pz241:9N\*
-AB#Q1q'Ò'y!'Q0_5S{N vGgWyH!'c.'Sq s2MsclV +
a0N&?)o Z6`9Y٨9x*@ʎ "0~aPO,)(ZƮ̔ r1˛ՒC?& #坨l9QuꬬkRS*+p)7g&P;3GH vVy
-htT(vme0w .xRp)V}iin
-S-1{'w<}m!`q| U#SS VhxA}˺Ҝ&N d7Q碝+Rޓ!k ?=H¡URnDqq
-$cPAdbqP,(4"T?&;H @P(0{^^Gtg/O^1FR P%.c|B=0&7F! ^6viBҚT%);QX*']OA;V|MKB N) yS)/i &\ThB Hơ i4En Jݣ\^DF
A، ' D
wYjS! ?sQJwM1} _K\~$ bVr7zJjۊ3|zJb (2`J
-DW]ǀȮ#|]Dkg #h $X!l kgR"
-fWUUy?#z a!' Xi0}vegT kc> Q
-/2Rd^yJE<zJe+O<"|Tڲh ~LfA `w8*|])a@߱ڧn0;> K}9se5[ IENDB`
\ No newline at end of file
diff --git a/core/assets/vendor/farbtastic/wheel.png b/core/assets/vendor/farbtastic/wheel.png
deleted file mode 100644
index 4a905e9..0000000
--- a/core/assets/vendor/farbtastic/wheel.png
+++ /dev/null
@@ -1,49 +0,0 @@
-PNG
-
-
IHDR ? - IDATx^m]u}_!1+V@lQlu&bJPNN[A*`e E*%(D*DQVSi̜k ~3Zg9'{?'{kI'~wޙz.mٚL[ܗdU*kT<M @#1z 'RO;
mg j]u2[-[cfd[Ča9&b KADʢ
CX}ȲļLa3"[ Fq/%Q[`p& ~CW9Nx]٦/zN)JvVLNbh_ %e'_
-H iB̖, mydvˤ)Dvr>l{)CUE 3e<ڔWx +2[壒 G%0NK:t#-D"@q\F\ aVQDAmj몼2U'&Ze J}Q6h
-RFe?zjݔq9#/nfHd QQ72bP MJYdk t\=kdxf|(~@:T'@*>7L5:T87sa]d|dg>tbҤ4@rn(`(hSp_a:zFd?> ]G AJ Q>!&h5S6v慖sd ٹ3xGH_ڃD0
>C`] kjSXX~$e (Binjd.yQ7@@v6h_$@n ύ)+R 4yV^ <@~q'O_h Oˆ*jY9y t ڤ&gVhnP>F<_*"N2K>>$@R7H2bj| q' `Ї2 C;y7`7a>v6pKX\JS1O2 }.A+ɼ
Od X#bq=a#Tʓ /0dK?<ٶJi~F)Yf]>oD'CC[hH6hi- $j>*qqSz1r$/^%9/ ܼĄ #I> ƛ]9?Fl
S#iM-Z h1~Z c9סK¡¾vTKsY}ʕG![1'%mxIׅ+W].ܕ9b/Q9LX(&A~BDd {g wfIG"ZZ%1}W(\t-%c01~( ̅485z- Um:C:81J/|gK~]]j[?ldZ㙼#GjlS"N嶑/%%C9^D2= @=)jҽ X{~8緞_13$'?)-v\yxeg5r)5QSH_b9<|kr#¾pe M+Vb ʐ-"N!Z]
-Rs["]A,shgYG]k;G% %!1 M,\osh[7˙:´߉dU !֟ FK]Je *sBy(I^;a-&ZB !,C!
#K ǻ;ֺJ8IB4<ɞjÛ /!F*ckTЫu50 | Ib֪pP
0o9@83?ݱU boџYY#
8D'@^C|tbx7 O"qޫrdP!
~i{
-,g _(W ?Dv#u5ue.ԔI!T3#g̒!eg{&0# t5w3N gb% *%I!l%|ƃ~7drbq -CronFw#VB 8*3?9ras0(/GQ\wFwȋdgRef{2jRNƷv8rozSz~#qiF(P Vj=5.xTy]uwp\) Y fYKI0G?gxh5r[U^--,έ$Ni bQ#BnM ʽEt5]m*Jjڎ(90W aՔJy%EVS2KsZRN Ք%%̑DA,Us+*{lnH2dy'N!d-A IҰhrε6"" ^'fGH.U٭؈ń8SB:x+є@ RX6՚X}b3ab8u.Ph HmMZm P
*D>R?JnBL45DPj$iBIMkAx&" VއO/
-t@\?%^%s*]3XH4^Vw9}Lr5·' 5p6(LVN]&em JJ$U49|Ixo /H
-i }nTAk(a&1ˁ?]axII
TB!L¹{+I: Ji}S}p3a+ :P*`½|T FQ] y~RN H ۄQzɀ4X_'NBh奔S| L\ByƁZ4 5Pt4E"v=k2cP,폶_!lT`2W,[ |5%Q?/ab+0(ڙU@ Rd`v~yW R ZkY VS-sy\+t`}~nhS0. g *LC)^NRv6i+ E c>*D amȁEϋ°
-[5J|锚[A2 +MFaf
-` @ rѬuЏ!~ hiJ (p7;Io+__*n9=BՇGI_3<Jٝ#
-@
#h@4U2A8zJyHaw\un6yX+P}{"n럏}"GX` (WH;'X Eep \nY)/Kr_ ?.^ vpy[$)lV cv[
-Q`|$\ Xs7Ji늁Htp~46*D[46 Ղa \ytTPz0~VM Nyɧ[3ʯ"l4PXOX' FAQ9
-4^
-r/[ ݿ`7z ~,*$ ӐiM6D[ҜK#p ,$c|h1ZZJχD `Jx ^mm 9#QC#0O
-eUws^2=J&IF
-b@Nl[e C % A*{VE12 wU{DBT>+X0lFX +< HlLwo y ?X}8LȔDv|qkF X %"%6 NizN
_ @ U}SbEH Lad?њ]/ R\\.Uk4RUo> 8P):IsD@
F)zh|Fڱpl
-yH `Gɨ:[aW74k6+uR&Ȯs L3 oa, ʤm,y! w 뼼}2k0]2ʝgߪ_HkcK~V hD;E k[ ǔ_GNA, 1
`xDxEApJ&w>08Y94SX(2@\P_}
-ۀٱ" 갲2 7E"_2YѼktw~w![u0>'th1LJM1COE]j)7+VV^^ 7mjo4ZZe@% x6n|S4wzm? 'W J C n|)s+. uʟ ƗÎ <';A2);Jq *` {gGY%yA~|ĶPC(
-~ed7qWCIdU
, 7AmR5Y`Coj[Ji}Mɜ3}%w~f&ik9;c|]XWZMcCm2@Ε^X4S ++`d)
-ոdiI`> A " W%U $>A66.׀U:` p)ΈP`glJ㔡G%Yy( )HU ' 3z֥@_rKᥱI%(:7QI03 .D
lPl62cv ,GeSN^o`JCGHC{t7ƈ3TY@[Z C
-@GeFDIU&I=3/>l" k8G~3qcgkuIp"r VIGI *H?]ޗƿT ` Ks T4AeC #S`'0%=E#^ XeP*1 ߹+2gC* L@j9`e뫿) 2 #K#,$e /2>* tn7~z Ҕ1̌FS}{Glx'V[2d
+!4Pwagӝgec_oeh FoP|7;fjJ葄#F" CC(\^bLĘe(s3>^iU $r"P2Kb=6˰_3/? *лE:gє!iFd
- (ٕNB +Fd_!6>2@=-C4$fϰd Jk5i3G"IZ3$%
- * `"m3 Bp
sWyb4y-?ƎP- Y2
-K# l Q3.tϰ &8I l2`B`x**W8d2! NђaW3_̑, Bct , 6q43D&3t!=Bpdd*XV@V l
-?VXI. /adIBbum{{V3Ig#
,3/HA ed*XRAm 18 t<6x7}d pZz~tl5eS'm|8{I&pR˔^0D)`C]_3I&
-ƫL$1`Zx+ Iցd2k# ĕ!mϻ_aKȗS> 'o2L&ye<`P"PYܗ0 `T2!h-<x{lXfv D0p7#|TpB bo @oqe "JHdj`'C}Rjx Rg^hw3Y0_
-_76 [0>@^c]t!5|"N `deL a/<:k!lg 2d2gj8> eB/&w 8+'CLSC"E*1 k5"fҡ*jbr L/ְ6b.6_ ܉CK]5;)2 +DG5Lz)*z %#Xu/w=2<OEh^u P2P^ e`o -(z !pc
u_u
-.*a=G a)G
-Z ~ x0Qk \r\.'#K¼C$5F5RM¿cpn!FC6wi J|9×\(BsV(W+,]B{j9|d ).KP:+ަIU=j:2`$°F#0HjI SJ,v!Yʛ@Bd4o ^fI o# )i̥{s Y-G;XBHdM#+L"\aWIPNXƀ9QN'# `m( 6z[=O̓\Ka8 ;gx=l&7 J%: HR n aD
-z TsӲ*cI@Lp+ke(oA9 $=uӃބ `f9_ -DAe
Ksh] `بz 쿋 5l"QP3z nރ*;wsBnB(M"*i*H*dJ[haB-3-"JaJR(*
:r@$ !IL'9g'9MwuZy> @Ddd z K@쭼R&! Ȱ|yL@ ̖S)B Y~R}_&]z"/! D#h/I%CFHR
;C\w}aؤG>%ByPT:vsR}[Ⱥ@ϫgOr &طWC=)I0, D~ jbߺDMWAELrdT=7T8M2+_fiOMGKZ˦ MX Q1V=N=ɄHOrw9%_Xm#KٴJk/lB*_og? yl o=,\)IoM &Y 7e8\@
-LQ
ä/2Qm?i%GTEfoc~Ԝ ~Xa#/ʤ/&&ihz @xIQ3jFELQZ8$G[ = IZ (h! q; 4~J}F_=jU4`7Nө} b*, 6 Jkx19e_76 4Dm%IH&Ig득Z= S}
- aCoҜ/ }vfGdsXIHW٢$IZW%.jELɶ2IrjH#9< @aGLWx$}Ru*T,$S$tZ}os꯹fH)꧟Ŀ%.ơ~2r咨˥X ~ ٌO0YrBt6;T WRHP8Nc̭oز@R?!s炲2`Lǁ]QXbj}8,BGP=p
-ĭ'9ә-:݇ϛQL'gۙj'yYd('Ġ=uDqb4<HKUL|P'[ΩsV}[* .u LG(QNk:' b P3Vx278Fap #;mGDɡo>ڏ<%%[vڼXm$
[G.}H iq
q ;Гa{M U;o?#qݭK ϋГaKDxwf_hݚv4kcH
-4aqgz2HrUbD ۘ(?v:e TaW z2ӕqdDˑ-eDWk-q5b7D\ pE ͑|^8V6: W
-t:# ^_FNHL#6n.r9BETV'ڶ>b 툱t7s"
-z2})EA &9*ǝ'F2tGNcƻ_.=v ) _EO 'JJQ!E= )%(\(nf2QKw y*{*џ%*bV^F05:eW1SL*_\gyWۦ: ^%.ļ
Y'C1tic6GtSy9
-Y5=z 7pnsG.Lp').once('color').prependTo(form);
- var farb = $.farbtastic('#placeholder');
-
- // Decode reference colors to HSL.
- var reference = settings.color.reference;
- for (i in reference) {
- if (reference.hasOwnProperty(i)) {
- reference[i] = farb.RGBToHSL(farb.unpack(reference[i]));
- }
- }
// Build a preview.
var height = [];
var width = [];
+ var $editScheme = $form.find('#edit-scheme');
+
// Loop through all defined gradients.
- for (i in settings.gradients) {
+ for (var i in settings.gradients) {
if (settings.gradients.hasOwnProperty(i)) {
// Add element to display the gradient.
$('#preview').once('color').append('');
@@ -48,209 +33,54 @@
// Add rows (or columns for horizontal gradients).
// Each gradient line should have a height (or width for horizontal
// gradients) of 10px (because we divided the height/width by 10 above).
- for (j = 0; j < (settings.gradients[i].direction === 'vertical' ? height[i] : width[i]); ++j) {
+ for (var j = 0; j < (settings.gradients[i].direction === 'vertical' ? height[i] : width[i]); ++j) {
gradient.append('');
}
}
}
// Set up colorScheme selector.
- form.find('#edit-scheme').on('change', function () {
+ $editScheme.on('change', function () {
var schemes = settings.color.schemes, colorScheme = this.options[this.selectedIndex].value;
if (colorScheme !== '' && schemes[colorScheme]) {
// Get colors of active scheme.
- colors = schemes[colorScheme];
+ var colors = schemes[colorScheme];
for (var fieldName in colors) {
if (colors.hasOwnProperty(fieldName)) {
- callback($('#edit-palette-' + fieldName), colors[fieldName], false, true);
+ setScheme($('#edit-palette-' + fieldName), colors[fieldName], true);
}
}
preview();
}
});
- /**
- * Renders the preview.
- */
- function preview() {
- Drupal.color.callback(context, settings, form, farb, height, width);
- }
-
- /**
- * Shifts a given color, using a reference pair (ref in HSL).
- *
- * This algorithm ensures relative ordering on the saturation and luminance
- * axes is preserved, and performs a simple hue shift.
- *
- * It is also symmetrical. If: shift_color(c, a, b) === d, then
- * shift_color(d, b, a) === c.
- */
- function shift_color(given, ref1, ref2) {
- var d;
- // Convert to HSL.
- given = farb.RGBToHSL(farb.unpack(given));
-
- // Hue: apply delta.
- given[0] += ref2[0] - ref1[0];
-
- // Saturation: interpolate.
- if (ref1[1] === 0 || ref2[1] === 0) {
- given[1] = ref2[1];
- }
- else {
- d = ref1[1] / ref2[1];
- if (d > 1) {
- given[1] /= d;
- }
- else {
- given[1] = 1 - (1 - given[1]) * d;
- }
- }
-
- // Luminance: interpolate.
- if (ref1[2] === 0 || ref2[2] === 0) {
- given[2] = ref2[2];
- }
- else {
- d = ref1[2] / ref2[2];
- if (d > 1) {
- given[2] /= d;
- }
- else {
- given[2] = 1 - (1 - given[2]) * d;
- }
- }
-
- return farb.pack(farb.HSLToRGB(given));
- }
+ // Trigger callback on input change
+ $form.on('change keyup', '[data-drupal-color]', function () {
+ // Reset the color scheme selector.
+ $editScheme.val('_none');
+ preview();
+ });
/**
- * Callback for Farbtastic when a new color is chosen.
+ * Callback when a new scheme is chosen.
*/
- function callback(input, color, propagate, colorScheme) {
- var matched;
- // Set background/foreground colors.
- $(input).css({
- backgroundColor: color,
- 'color': farb.RGBToHSL(farb.unpack(color))[2] > 0.5 ? '#000' : '#fff'
- });
-
+ function setScheme(input, color, colorScheme) {
// Change input value.
if ($(input).val() && $(input).val() !== color) {
$(input).val(color);
- // Update locked values.
- if (propagate) {
- i = input.i;
- for (j = i + 1; ; ++j) {
- if (!locks[j - 1] || $(locks[j - 1]).is('.unlocked')) {
- break;
- }
- matched = shift_color(color, reference[input.key], reference[inputs[j].key]);
- callback(inputs[j], matched, false);
- }
- for (j = i - 1; ; --j) {
- if (!locks[j] || $(locks[j]).is('.unlocked')) {
- break;
- }
- matched = shift_color(color, reference[input.key], reference[inputs[j].key]);
- callback(inputs[j], matched, false);
- }
-
- // Update preview.
- preview();
- }
-
- // Reset colorScheme selector.
- if (!colorScheme) {
- resetScheme();
- }
+ // Update preview.
+ preview();
}
}
/**
- * Resets the color scheme selector.
- */
- function resetScheme() {
- form.find('#edit-scheme').each(function () {
- this.selectedIndex = this.options.length - 1;
- });
- }
-
- /**
- * Focuses Farbtastic on a particular field.
+ * Renders the preview.
*/
- function focus(e) {
- var input = e.target;
- // Remove old bindings.
- if (focused) {
- $(focused).off('keyup', farb.updateValue)
- .off('keyup', preview).off('keyup', resetScheme)
- .parent().removeClass('item-selected');
- }
-
- // Add new bindings.
- focused = input;
- farb.linkTo(function (color) { callback(input, color, true, false); });
- farb.setColor(input.value);
- $(focused).on('keyup', farb.updateValue).on('keyup', preview).on('keyup', resetScheme)
- .parent().addClass('item-selected');
+ function preview() {
+ Drupal.color.callback(context, settings, $form, height, width);
}
- // Initialize color fields.
- form.find('#palette input.form-text')
- .each(function () {
- // Extract palette field name
- this.key = this.id.substring(13);
-
- // Link to color picker temporarily to initialize.
- farb.linkTo(function () {}).setColor('#000').linkTo(this);
-
- // Add lock.
- var i = inputs.length;
- if (inputs.length) {
- var toggleClick = true;
- var lock = $('').on('click', function () {
- if (toggleClick) {
- $(this).addClass('unlocked');
- $(hooks[i - 1]).attr('class',
- locks[i - 2] && $(locks[i - 2]).is(':not(.unlocked)') ? 'hook up' : 'hook'
- );
- $(hooks[i]).attr('class',
- locks[i] && $(locks[i]).is(':not(.unlocked)') ? 'hook down' : 'hook'
- );
- }
- else {
- $(this).removeClass('unlocked');
- $(hooks[i - 1]).attr('class',
- locks[i - 2] && $(locks[i - 2]).is(':not(.unlocked)') ? 'hook both' : 'hook down'
- );
- $(hooks[i]).attr('class',
- locks[i] && $(locks[i]).is(':not(.unlocked)') ? 'hook both' : 'hook up'
- );
- }
- toggleClick = !toggleClick;
- });
- $(this).after(lock);
- locks.push(lock);
- }
-
- // Add hook.
- var hook = $('');
- $(this).after(hook);
- hooks.push(hook);
-
- $(this).parent().find('.lock').trigger('click');
- this.i = i;
- inputs.push(this);
- })
- .on('focus', focus);
-
- form.find('#palette label');
-
- // Focus first color.
- inputs[0].focus();
-
// Render preview.
preview();
}
diff --git a/core/modules/color/color.libraries.yml b/core/modules/color/color.libraries.yml
index c6a2db9..ea56efd 100644
--- a/core/modules/color/color.libraries.yml
+++ b/core/modules/color/color.libraries.yml
@@ -6,7 +6,6 @@ drupal.color:
- core/jquery
- core/drupal
- core/jquery.once
- - core/jquery.farbtastic
- color/drupal.color.preview
drupal.color.preview:
diff --git a/core/modules/color/color.module b/core/modules/color/color.module
index 6ecf036..d973fa2 100644
--- a/core/modules/color/color.module
+++ b/core/modules/color/color.module
@@ -168,7 +168,7 @@ function color_scheme_form($complete_form, &$form_state, $theme) {
$base = drupal_get_path('module', 'color');
$info = color_get_info($theme);
- $info['schemes'][''] = array('title' => t('Custom'), 'colors' => array());
+ $info['schemes']['_none'] = array('title' => t('Custom'), 'colors' => array());
$color_sets = array();
$schemes = array();
foreach ($info['schemes'] as $key => $scheme) {
@@ -237,7 +237,7 @@ function color_scheme_form($complete_form, &$form_state, $theme) {
'#value_callback' => 'color_palette_color_value',
'#default_value' => $value,
'#size' => 8,
- '#attributes' => array('dir' => 'ltr'),
+ '#attributes' => array('dir' => 'ltr', 'data-drupal-color' => $name),
);
}
}
@@ -354,7 +354,7 @@ function color_scheme_form_submit($form, &$form_state) {
// Resolve palette.
$palette = $form_state['values']['palette'];
- if ($form_state['values']['scheme'] != '') {
+ if ($form_state['values']['scheme'] != '_none') {
foreach ($palette as $key => $color) {
if (isset($info['schemes'][$form_state['values']['scheme']]['colors'][$key])) {
$palette[$key] = $info['schemes'][$form_state['values']['scheme']]['colors'][$key];
diff --git a/core/modules/color/css/color.admin.css b/core/modules/color/css/color.admin.css
index 5da8c35..0bf3bb5 100644
--- a/core/modules/color/css/color.admin.css
+++ b/core/modules/color/css/color.admin.css
@@ -5,9 +5,6 @@
.color-form {
max-width: 50em;
}
-.farbtastic {
- margin: 0 auto;
-}
.color-form .form-item {
overflow: hidden;
margin: 0.5em 0;
@@ -20,9 +17,7 @@
}
.color-form .form-text {
float: left; /* LTR */
- width: 86%;
- text-align: center;
- cursor: pointer;
+ width: auto;
}
[dir="rtl"] .color-form .form-text {
float: right;
@@ -80,10 +75,7 @@
float: left;
}
.color-form .form-item {
- margin: 0.5em 195px 0.5em 0; /* LTR */
- }
- [dir="rtl"] .color-form .form-item {
- margin: 0.5em 0 0.5em 195px;
+ margin: 0.5em;
}
.color-form label {
float: left; /* LTR */
@@ -94,7 +86,7 @@
float: right;
clear: right;
}
- .color-form .form-text,
+ .color-form .text,
.color-form .form-select {
float: left; /* LTR */
width: auto;
diff --git a/core/modules/color/lib/Drupal/color/Tests/ColorConfigSchemaTest.php b/core/modules/color/lib/Drupal/color/Tests/ColorConfigSchemaTest.php
index ebaa303..58da6e6 100644
--- a/core/modules/color/lib/Drupal/color/Tests/ColorConfigSchemaTest.php
+++ b/core/modules/color/lib/Drupal/color/Tests/ColorConfigSchemaTest.php
@@ -53,7 +53,7 @@ function setUp() {
*/
function testValidColorConfigSchema() {
$settings_path = 'admin/appearance/settings/bartik';
- $edit['scheme'] = '';
+ $edit['scheme'] = '_none';
$edit['palette[bg]'] = '#123456';
$this->drupalPostForm($settings_path, $edit, t('Save configuration'));
$this->assertConfigSchema(\Drupal::service('config.typed'), 'color.theme.bartik', \Drupal::config('color.theme.bartik')->get());
diff --git a/core/modules/color/lib/Drupal/color/Tests/ColorTest.php b/core/modules/color/lib/Drupal/color/Tests/ColorTest.php
index 32bdd1a..54e9289 100644
--- a/core/modules/color/lib/Drupal/color/Tests/ColorTest.php
+++ b/core/modules/color/lib/Drupal/color/Tests/ColorTest.php
@@ -119,7 +119,7 @@ function _testColor($theme, $test_values) {
$this->drupalGet($settings_path);
$this->assertResponse(200);
$this->assertUniqueText('Color set');
- $edit['scheme'] = '';
+ $edit['scheme'] = '_none';
$edit[$test_values['palette_input']] = '#123456';
$this->drupalPostForm($settings_path, $edit, t('Save configuration'));
@@ -168,7 +168,7 @@ function testValidColor() {
$settings_path = 'admin/appearance/settings/bartik';
$this->drupalLogin($this->big_user);
- $edit['scheme'] = '';
+ $edit['scheme'] = '_none';
foreach ($this->colorTests as $color => $is_valid) {
$edit['palette[bg]'] = $color;
diff --git a/core/modules/color/preview.js b/core/modules/color/preview.js
index 5e79855..dd4d356 100644
--- a/core/modules/color/preview.js
+++ b/core/modules/color/preview.js
@@ -8,7 +8,7 @@
"use strict";
Drupal.color = {
- callback: function (context, settings, form, farb, height, width) {
+ callback: function (context, settings, form, height, width) {
// Solid background.
form.find('#preview').css('backgroundColor', form.find('#palette input[name="palette[base]"]').val());
@@ -22,15 +22,15 @@
accum[k] += delta[k];
}
}
- element.style.backgroundColor = farb.pack(accum);
+ element.style.backgroundColor = accum;
}
// Set up gradients if there are some.
var color_start, color_end;
for (var i in settings.gradients) {
if (settings.gradients.hasOwnProperty(i)) {
- color_start = farb.unpack(form.find('#palette input[name="palette[' + settings.gradients[i].colors[0] + ']"]').val());
- color_end = farb.unpack(form.find('#palette input[name="palette[' + settings.gradients[i].colors[1] + ']"]').val());
+ color_start = form.find('#palette input[name="palette[' + settings.gradients[i].colors[0] + ']"]').val();
+ color_end = form.find('#palette input[name="palette[' + settings.gradients[i].colors[1] + ']"]').val();
if (color_start && color_end) {
var delta = [];
for (var j in color_start) {
diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php
index f6f3da8..dd16e11 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php
@@ -606,12 +606,12 @@ function testAlter() {
*/
function testLibraryRender() {
$attached = array();
- $attached['#attached']['library'][] = 'core/jquery.farbtastic';
+ $attached['#attached']['library'][] = 'core/jquery.ui';
drupal_render($attached);
$scripts = drupal_get_js();
$styles = drupal_get_css();
- $this->assertTrue(strpos($scripts, 'core/assets/vendor/farbtastic/farbtastic.js'), 'JavaScript of library was added to the page.');
- $this->assertTrue(strpos($styles, 'core/assets/vendor/farbtastic/farbtastic.css'), 'Stylesheet of library was added to the page.');
+ $this->assertTrue(strpos($scripts, 'core/assets/vendor/jquery.ui/ui/jquery.ui.core.js'), 'JavaScript of library was added to the page.');
+ $this->assertTrue(strpos($styles, 'core/assets/vendor/jquery.ui/themes/base/jquery.ui.core.css'), 'Stylesheet of library was added to the page.');
}
/**
@@ -620,14 +620,14 @@ function testLibraryRender() {
* @see common_test_library_info_alter()
*/
function testLibraryAlter() {
- // Verify that common_test altered the title of Farbtastic.
+ // Verify that common_test altered the title of jQuery UI.
/** @var \Drupal\Core\Asset\LibraryDiscoveryInterface $library_discovery */
$library_discovery = \Drupal::service('library.discovery');
- $library = $library_discovery->getLibraryByName('core', 'jquery.farbtastic');
+ $library = $library_discovery->getLibraryByName('core', 'jquery.ui');
$this->assertEqual($library['version'], '0.0', 'Registered libraries were altered.');
// common_test_library_info_alter() also added a dependency on jQuery Form.
- $attached['#attached']['library'][] = 'core/jquery.farbtastic';
+ $attached['#attached']['library'][] = 'core/jquery.ui';
drupal_render($attached);
$scripts = drupal_get_js();
$this->assertTrue(strpos($scripts, 'core/assets/vendor/jquery-form/jquery.form.js'), 'Altered library dependencies are added to the page.');
@@ -641,8 +641,8 @@ function testLibraryAlter() {
function testLibraryNameConflicts() {
/** @var \Drupal\Core\Asset\LibraryDiscoveryInterface $library_discovery */
$library_discovery = \Drupal::service('library.discovery');
- $farbtastic = $library_discovery->getLibraryByName('common_test', 'jquery.farbtastic');
- $this->assertEqual($farbtastic['version'], '0.1', 'Alternative libraries can be added to the page.');
+ $jquery_ui = $library_discovery->getLibraryByName('common_test', 'jquery.ui');
+ $this->assertEqual($jquery_ui['version'], '0.1', 'Alternative libraries can be added to the page.');
}
/**
@@ -665,10 +665,10 @@ function testLibraryUnknown() {
* Tests the addition of libraries through the #attached['library'] property.
*/
function testAttachedLibrary() {
- $element['#attached']['library'][] = 'core/jquery.farbtastic';
+ $element['#attached']['library'][] = 'core/jquery.ui';
drupal_render($element);
$scripts = drupal_get_js();
- $this->assertTrue(strpos($scripts, 'core/assets/vendor/farbtastic/farbtastic.js'), 'The attached_library property adds the additional libraries.');
+ $this->assertTrue(strpos($scripts, 'core/assets/vendor/jquery.ui/ui/jquery.ui.core.js'), 'The attached_library property adds the additional libraries.');
}
/**
@@ -679,18 +679,18 @@ function testGetLibrary() {
$library_discovery = \Drupal::service('library.discovery');
// Retrieve all libraries registered by a module.
$libraries = $library_discovery->getLibrariesByExtension('common_test');
- $this->assertTrue(isset($libraries['jquery.farbtastic']), 'Retrieved all module libraries.');
+ $this->assertTrue(isset($libraries['jquery.ui']), 'Retrieved all module libraries.');
// Retrieve all libraries for a module not declaring any libraries.
// Note: This test installs language module.
$libraries = $library_discovery->getLibrariesByExtension('dblog');
- $this->assertEqual($libraries, array(), 'Retrieving libraries from a module not declaring any libraries returns an emtpy array.');
+ $this->assertEqual($libraries, array(), 'Retrieving libraries from a module not declaring any libraries returns an empty array.');
// Retrieve a specific library by module and name.
- $farbtastic = $library_discovery->getLibraryByName('common_test', 'jquery.farbtastic');
- $this->assertEqual($farbtastic['version'], '0.1', 'Retrieved a single library.');
+ $jquery_ui = $library_discovery->getLibraryByName('common_test', 'jquery.ui');
+ $this->assertEqual($jquery_ui['version'], '0.1', 'Retrieved a single library.');
// Retrieve a non-existing library by module and name.
- $farbtastic = $library_discovery->getLibraryByName('common_test', 'foo');
- $this->assertIdentical($farbtastic, FALSE, 'Retrieving a non-existing library returns FALSE.');
+ $jquery_ui = $library_discovery->getLibraryByName('common_test', 'foo');
+ $this->assertIdentical($jquery_ui, FALSE, 'Retrieving a non-existing library returns FALSE.');
}
/**
diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php
index c69838a..0802d7d 100644
--- a/core/modules/system/system.api.php
+++ b/core/modules/system/system.api.php
@@ -251,24 +251,24 @@ function hook_js_alter(&$javascript) {
* The name of the module that registered the libraries.
*/
function hook_library_info_alter(&$libraries, $module) {
- // Update Farbtastic to version 2.0.
- if ($module == 'core' && isset($libraries['jquery.farbtastic'])) {
+ // Update jQuery UI to version 2.0.
+ if ($module == 'core' && isset($libraries['jquery.ui'])) {
// Verify existing version is older than the one we are updating to.
- if (version_compare($libraries['jquery.farbtastic']['version'], '2.0', '<')) {
- // Update the existing Farbtastic to version 2.0.
- $libraries['jquery.farbtastic']['version'] = '2.0';
+ if (version_compare($libraries['jquery.ui']['version'], '2.0', '<')) {
+ // Update the existing jQuery UI to version 2.0.
+ $libraries['jquery.ui']['version'] = '2.0';
// To accurately replace library files, the order of files and the options
// of each file have to be retained; e.g., like this:
- $old_path = 'assets/vendor/farbtastic';
+ $old_path = 'assets/vendor/jquery.ui';
// Since the replaced library files are no longer located in a directory
// relative to the original extension, specify an absolute path (relative
// to DRUPAL_ROOT / base_path()) to the new location.
- $new_path = '/' . drupal_get_path('module', 'farbtastic_update') . '/js';
+ $new_path = '/' . drupal_get_path('module', 'jquery.ui_update') . '/js';
$new_js = array();
$replacements = array(
- $old_path . '/farbtastic.js' => $new_path . '/farbtastic-2.0.js',
+ $old_path . '/jquery.ui.js' => $new_path . '/jquery.ui-2.0.js',
);
- foreach ($libraries['jquery.farbtastic']['js'] as $source => $options) {
+ foreach ($libraries['jquery.ui']['js'] as $source => $options) {
if (isset($replacements[$source])) {
$new_js[$replacements[$source]] = $options;
}
@@ -276,7 +276,7 @@ function hook_library_info_alter(&$libraries, $module) {
$new_js[$source] = $options;
}
}
- $libraries['jquery.farbtastic']['js'] = $new_js;
+ $libraries['jquery.ui']['js'] = $new_js;
}
}
}
diff --git a/core/modules/system/tests/modules/common_test/common_test.libraries.yml b/core/modules/system/tests/modules/common_test/common_test.libraries.yml
index 47d2b37..9ed01d6 100644
--- a/core/modules/system/tests/modules/common_test/common_test.libraries.yml
+++ b/core/modules/system/tests/modules/common_test/common_test.libraries.yml
@@ -1,9 +1,9 @@
-jquery.farbtastic:
+jquery.ui:
version: 0.1
js:
- assets/vendor/farbtastic/farbtastic.js: {}
+ assets/vendor/jquery.ui/ui/jquery.ui.core.js: {}
css:
component:
- assets/vendor/farbtastic/farbtastic.css: {}
+ assets/vendor/jquery.ui/themes/base/jquery.ui.core.css: {}
dependencies:
- core/jquery
diff --git a/core/modules/system/tests/modules/common_test/common_test.module b/core/modules/system/tests/modules/common_test/common_test.module
index 2785be9..205c25b 100644
--- a/core/modules/system/tests/modules/common_test/common_test.module
+++ b/core/modules/system/tests/modules/common_test/common_test.module
@@ -141,11 +141,11 @@ function theme_common_test_empty($variables) {
* Implements hook_library_info_alter().
*/
function common_test_library_info_alter(&$libraries, $module) {
- if ($module == 'core' && isset($libraries['jquery.farbtastic'])) {
- // Change the version of Farbtastic to 0.0.
- $libraries['jquery.farbtastic']['version'] = '0.0';
- // Make Farbtastic depend on jQuery Form to test library dependencies.
- $libraries['jquery.farbtastic']['dependencies'][] = 'core/jquery.form';
+ if ($module == 'core' && isset($libraries['jquery.ui'])) {
+ // Change the version of jQuery UI to 0.0.
+ $libraries['jquery.ui']['version'] = '0.0';
+ // Make jQuery UI depend on jQuery Form to test library dependencies.
+ $libraries['jquery.ui']['dependencies'][] = 'core/jquery.form';
}
}
diff --git a/core/themes/bartik/color/preview.js b/core/themes/bartik/color/preview.js
index cb57121..6637809 100644
--- a/core/themes/bartik/color/preview.js
+++ b/core/themes/bartik/color/preview.js
@@ -8,7 +8,7 @@
Drupal.color = {
logoChanged: false,
- callback: function(context, settings, form, farb, height, width) {
+ callback: function(context, settings, form, height, width) {
// Change the logo to be the real one.
if (!this.logoChanged) {
$('#preview #preview-logo img').attr('src', drupalSettings.color.logo);