From 2c414f4175a74fa75ae63f6c9c5582156023625e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Aleksander=20=C5=81ukasz?=
 <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Fri, 25 Apr 2014 15:30:02 +0200
Subject: [PATCH] Editor update - span icons behavior fix

> editor: span icon clickable when cursor in appropriate fragment & enables span removal
> smartxml: some helper functions
> smartxml: minor refactoring - better naming
---
 apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo | Bin 5569 -> 5665 bytes
 apps/wiki/locale/pl/LC_MESSAGES/djangojs.po |  10 ++++++++++
 apps/wiki/static/wiki/editor                |   2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.mo
index 9f48fd9714eca55428b11b4b764c8bb34a0a2d0b..9ec048dad3fb388efe7a7a18eef1c7cdf40e278a 100644
GIT binary patch
delta 1859
zcmXxlSx8h-9LMp0X>OU5ORg=WmMvE9t(IoCZ)Ob<*+ZF;q-AM_P>l}>Mk`4KQBV&S
zWDmj+6|~t#4-rLF6xN$9&_dBekVW609uNNKbMCqKp5=eej9r-*Ci~yV1fMdBj~Gcj
z7;Lr+YliSa$qqG(!5kcprKnpz48aXJ3O8d0He&)_!f|*9<FN;aVK0uxh%mFEW`3JU
zC7Ff-jKnfb!Ht-PO&En|kr%83!|@tw0$r#HJ;q>s>h8Zl#<F*)3H6}*`HNa;B%LHP
zzD=Z}6_%npSch6^1$wa-wZdbr{R-;&Tc{O1bM5ajj_dEJOaw>t_m_ztuCtxRsD+ea
zEaO{+Yp8SXL(RMu_2LQCfag&Y44?+S?(RRrXs%x&W7{X^PgI6_Q7aE(R9(lQo=ZZ1
zB9(M1vJeZ<huV_EsDUq{2EKvY@iuCuli05$EJ8iE9yO5~jKu?}eovwX>_FyXS5fcZ
zjU@k?(MuZG7VAb`_n-#+g8bPJK9q@nsE(pozMfA+4Va4UgUs?!d;Nyx${(l!!+BZ#
z#$gVoU@orkkpB!S%`{};CDdtsjr3*TP^Y*THIXz9h7M&GYT$Alk6SPukGS?u)CBG!
z$+EYo34CyVb^h{Gp>O+xTG3E?)nSW6wdbNzT;i-i{;ZJ?WvCT3&{6baJC4Ce$e(@S
zLtF6MT}QJ|3}xx4h5GZUOrWw1HGu}yjQ6AV@DOU{=THM(MrGz6>bYmA6nCSZ|LFXK
zTCs;lEhHXCU<T@J6(YOiw{`s$+lt!TJ*XG_sE&_2&!AG@j$V9>bMP~2V&gec8lVU@
zun+sbU8wursP})NGLpc<@p>YgihghwVJcRlI%q*n;0Wr4)2_V}HPLJCeiv#ho}g0t
z92vttx%+=n{e^K;TjD{^YTvmjt)Vhd^s<U(JCj&StRPhMd$61sO9T;lgtkp*BcCAK
zHl0u@AaeR@{bxbd$;7O-t|94jl(QLXqAVlU653!*S*3)~@98vMP|67XUaAzgrG~`%
zv#6~k))3057N1RM*H#fKO6dH)n%O+eCG<s_O(=OPtNXD`RAL6oA}Ukd#X@H}W)KU^
z+5#cb3#L-n7fy+tOK9UJ5ru?~rT)b%A;`TACKeMaI{W&5`G}%GcxY5mVr6y1riSXB
zJFL8_c4uRix2m>o+ot;J`hX`QKP;)TiM!^j-}CUGcW=|~`+<iycT`vL7buKr3HlFm
C%B6Au

delta 1776
zcmXxlSx8h-9LMp0E|W{HWu;kKsVz>qq*>{hEta{I>4WrUK?@Y2L{K13^q@t(nMsR;
zgyKVKHc>$fL{vo3{!nCv83YjoE%YMP_cwDo_`jcX&z*ag|2Z@EdGF==KO{$V8>Nv*
zC$5E=wPI}~7fRw}vt&%dM9e}xDn<{M;%r=tIoOOduoJWK0#3&V7>A=c2ft#hnct$L
z%+hE`!6}%Jv(Sh0a2v*B8}fpkz-a72O`s1op+StmA@@9hjA3_B6MBH^=RInn-!P5w
zEt=l6!Yot=C8(8_VJ6n0R=D4_pG1AW7qy}*uKg}f<Ng^c6Q5E2#m0mto`_SqPj~nE
zlJTvKie_4c30RLBpc&P{0n|W;-181h;{G%;h7CHeqB3$DwbJ|U{-t~V7H85v?wmk>
zF%2o?Ra;Pl8h96K;KR5V+fgg~imCV)^|@5`OB3;;R#uK0paC_py~r4L5cU2M)C9Yc
z?A!S%<X;W_G-$v}$e)dHQ6}!9I(mwF;SFlQG3=jY_7k<YXIQQrK@IpA)$eO8z;{@P
zadeu46_|&+6Ue_#XAccZ@eu0N-bVViPpCuq9W`(=2V((d;e4z`wYQ)qa1=?7okdMx
zz<Jqu4e82mp%(PSPeq68wR`XbmEtgZmFcJfmUB^ts!#*fVJ7ax4D3MuY=Dcl;HJBO
zfplr(sD=K*g&52JX#)NtDq5)z)p0c{6FX2VX+fp54YkLe&U2_04x?6d9aHcj>MV^S
zS+_q<4=-ygQ&6AJK%GC!3sr0tD%F*kiF?q8$59h|gc{%@YT)0fZ_k8#-o^>j`=?MD
zxPe;nbJXw27o3aXbfWjOF-ARjspy3g_n;m%)284D%(kOazYo=6E7F%8bI*HG9S$Pd
zwPECJ2G7Y_{9p90iWXBsR1r0`TvYV^uO_mHaH4?FKIse;5@gYe36*6;Ua%J0dsP<`
zE4s!a=le>jEmsp|6VX6ugEeK93PQh^MTE*`LcfP9<y~t$Q~gV*X<l0iWmJn_N@&~a
z2o+^?O|WLR8uJN#aaIyap30UG!K)JUzf@AmbvNss^_WAfGwXWgNviZx*B4BQEhDsZ
qDys+`OZ^MkNRVp_BQ_8!I_vsAH4?tSqRH{$fu<O5RN!KAd-y*_NQ>40

diff --git a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
index e7a166bd..1f962cd9 100644
--- a/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
+++ b/apps/wiki/locale/pl/LC_MESSAGES/djangojs.po
@@ -255,9 +255,19 @@ msgstr "Utwórz link z zaznaczonego tekstu"
 msgid "Mark as emphasized"
 msgstr "Oznacz jako wyróżnione"
 
+#: static/wiki/editor/src/editor/plugins/core/core.js:365
+msgid "Remove emphasis"
+msgstr "Usuń wyróżnienie"
+
+#: static/wiki/editor/src/editor/plugins/core/core.js:366
 #: static/wiki/editor/src/editor/plugins/core/core.js:326
 msgid "Mark as citation"
 msgstr "Oznacz jako cytat"
+
+#: static/wiki/editor/src/editor/plugins/core/core.js:366
+msgid "Remove citation"
+msgstr "Usuń cytat"
+
 msgid "Create footnote from selection"
 msgstr "Utwórz przypis z zaznaczonego tekstu"
 
diff --git a/apps/wiki/static/wiki/editor b/apps/wiki/static/wiki/editor
index bb204203..22e3b34b 160000
--- a/apps/wiki/static/wiki/editor
+++ b/apps/wiki/static/wiki/editor
@@ -1 +1 @@
-Subproject commit bb204203f5f64dd13b256263fd398e1463d4eaf9
+Subproject commit 22e3b34bf8d927591ec441d8a1af0002d9ebbbb3
-- 
2.20.1