From 1e65cb2557be90a14c2fb25221b9de441c12f5d3 Mon Sep 17 00:00:00 2001 From: Narissa Bayler Date: Tue, 13 Jan 2015 20:37:43 +0800 Subject: [PATCH] MDL-48616 editor_atto: add macrons to atto charmap --- .../atto/plugins/charmap/lang/en/atto_charmap.php | 11 +++++++++++ lib/editor/atto/plugins/charmap/lib.php | 11 +++++++++++ .../atto/plugins/charmap/tests/behat/charmap.feature | 5 ++--- .../moodle-atto_charmap-button-debug.js | 11 +++++++++++ .../moodle-atto_charmap-button-min.js | 4 ++-- .../moodle-atto_charmap-button.js | 11 +++++++++++ .../atto/plugins/charmap/yui/src/button/js/button.js | 11 +++++++++++ 7 files changed, 59 insertions(+), 5 deletions(-) diff --git a/lib/editor/atto/plugins/charmap/lang/en/atto_charmap.php b/lib/editor/atto/plugins/charmap/lang/en/atto_charmap.php index 830c5f1a773..66fc64f99a3 100644 --- a/lib/editor/atto/plugins/charmap/lang/en/atto_charmap.php +++ b/lib/editor/atto/plugins/charmap/lang/en/atto_charmap.php @@ -27,6 +27,7 @@ $string['pluginname'] = 'Insert character'; // The following are not ordered on purpose, they are kept // in the order in which they appear in the user interface. +$string['interrobang'] = 'interrobang'; $string['nobreakspace'] = 'no-break space'; $string['ampersand'] = 'ampersand'; $string['quotationmark'] = 'quotation mark'; @@ -123,16 +124,19 @@ $string['acircumflex_caps'] = 'A - circumflex'; $string['atilde_caps'] = 'A - tilde'; $string['adiaeresis_caps'] = 'A - diaeresis'; $string['aringabove_caps'] = 'A - ring above'; +$string['amacron_caps'] = 'A - macron'; $string['ligatureae_caps'] = 'ligature AE'; $string['ccedilla_caps'] = 'C - cedilla'; $string['egrave_caps'] = 'E - grave'; $string['eacute_caps'] = 'E - acute'; $string['ecircumflex_caps'] = 'E - circumflex'; $string['ediaeresis_caps'] = 'E - diaeresis'; +$string['emacron_caps'] = 'E - macron'; $string['igrave_caps'] = 'I - grave'; $string['iacute_caps'] = 'I - acute'; $string['icircumflex_caps'] = 'I - circumflex'; $string['idiaeresis_caps'] = 'I - diaeresis'; +$string['imacron_caps'] = 'I - macron'; $string['eth_caps'] = 'ETH'; $string['ntilde_caps'] = 'N - tilde'; $string['ograve_caps'] = 'O - grave'; @@ -141,12 +145,14 @@ $string['ocircumflex_caps'] = 'O - circumflex'; $string['otilde_caps'] = 'O - tilde'; $string['odiaeresis_caps'] = 'O - diaeresis'; $string['oslash_caps'] = 'O - slash'; +$string['omacron_caps'] = 'O - macron'; $string['ligatureoe_caps'] = 'ligature OE'; $string['scaron_caps'] = 'S - caron'; $string['ugrave_caps'] = 'U - grave'; $string['uacute_caps'] = 'U - acute'; $string['ucircumflex_caps'] = 'U - circumflex'; $string['udiaeresis_caps'] = 'U - diaeresis'; +$string['umacron_caps'] = 'U - macron'; $string['yacute_caps'] = 'Y - acute'; $string['ydiaeresis_caps'] = 'Y - diaeresis'; $string['thorn_caps'] = 'THORN'; @@ -156,16 +162,19 @@ $string['acircumflex'] = 'a - circumflex'; $string['atilde'] = 'a - tilde'; $string['adiaeresis'] = 'a - diaeresis'; $string['aringabove'] = 'a - ring above'; +$string['amacron'] = 'a - macron'; $string['ligatureae'] = 'ligature ae'; $string['ccedilla'] = 'c - cedilla'; $string['egrave'] = 'e - grave'; $string['eacute'] = 'e - acute'; $string['ecircumflex'] = 'e - circumflex'; $string['ediaeresis'] = 'e - diaeresis'; +$string['emacron'] = 'e - macron'; $string['igrave'] = 'i - grave'; $string['iacute'] = 'i - acute'; $string['icircumflex'] = 'i - circumflex'; $string['idiaeresis'] = 'i - diaeresis'; +$string['imacron'] = 'i - macron'; $string['eth'] = 'eth'; $string['ntilde'] = 'n - tilde'; $string['ograve'] = 'o - grave'; @@ -174,12 +183,14 @@ $string['ocircumflex'] = 'o - circumflex'; $string['otilde'] = 'o - tilde'; $string['odiaeresis'] = 'o - diaeresis'; $string['oslash'] = 'o slash'; +$string['omacron'] = 'o - macron'; $string['ligatureoe'] = 'ligature oe'; $string['scaron'] = 's - caron'; $string['ugrave'] = 'u - grave'; $string['uacute'] = 'u - acute'; $string['ucircumflex'] = 'u - circumflex'; $string['udiaeresis'] = 'u - diaeresis'; +$string['umacron'] = 'u - macron'; $string['yacute'] = 'y - acute'; $string['thorn'] = 'thorn'; $string['ydiaeresis'] = 'y - diaeresis'; diff --git a/lib/editor/atto/plugins/charmap/lib.php b/lib/editor/atto/plugins/charmap/lib.php index 844ae601de6..b6c81a65854 100644 --- a/lib/editor/atto/plugins/charmap/lib.php +++ b/lib/editor/atto/plugins/charmap/lib.php @@ -36,6 +36,17 @@ function atto_charmap_strings_for_js() { // which are enabled in the JavaScript part of this plugin. $PAGE->requires->strings_for_js( array( + 'amacron', + 'emacron', + 'imacron', + 'omacron', + 'umacron', + 'amacron_caps', + 'emacron_caps', + 'imacron_caps', + 'omacron_caps', + 'umacron_caps', + 'interrobang', 'insertcharacter', 'nobreakspace', 'ampersand', diff --git a/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature b/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature index a73ee3f662c..834babcaeb1 100644 --- a/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature +++ b/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature @@ -11,8 +11,7 @@ Feature: Atto charmap button And I select the text in the "Description" Atto editor When I click on "Show more buttons" "button" And I click on "Insert character" "button" - And I click on "copyright sign" "button" + And I click on "a - macron" "button" And I press "Update profile" And I follow "Edit profile" - Then I should see "(c)" - + Then I should see "ā" diff --git a/lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button-debug.js b/lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button-debug.js index a0089aa8c3d..abf658ec01a 100644 --- a/lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button-debug.js +++ b/lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button-debug.js @@ -48,6 +48,7 @@ var COMPONENTNAME = 'atto_charmap', [' ', ' ', true, 'nobreakspace'], ['&', '&', true, 'ampersand'], ['"', '"', true, 'quotationmark'], + ['‽', '‽', true, 'interrobang'], // Finance. ['¢', '¢', true, 'centsign'], ['€', '€', true, 'eurosign'], @@ -147,16 +148,19 @@ var COMPONENTNAME = 'atto_charmap', ['Ã', 'Ã', true, 'atilde_caps'], ['Ä', 'Ä', true, 'adiaeresis_caps'], ['Å', 'Å', true, 'aringabove_caps'], + ['Ā', 'Ā', true, 'amacron_caps'], ['Æ', 'Æ', true, 'ligatureae_caps'], ['Ç', 'Ç', true, 'ccedilla_caps'], ['È', 'È', true, 'egrave_caps'], ['É', 'É', true, 'eacute_caps'], ['Ê', 'Ê', true, 'ecircumflex_caps'], ['Ë', 'Ë', true, 'ediaeresis_caps'], + ['Ē', 'Ē', true, 'emacron_caps'], ['Ì', 'Ì', true, 'igrave_caps'], ['Í', 'Í', true, 'iacute_caps'], ['Î', 'Î', true, 'icircumflex_caps'], ['Ï', 'Ï', true, 'idiaeresis_caps'], + ['Ī', 'Ī', true, 'imacron_caps'], ['Ð', 'Ð', true, 'eth_caps'], ['Ñ', 'Ñ', true, 'ntilde_caps'], ['Ò', 'Ò', true, 'ograve_caps'], @@ -165,12 +169,14 @@ var COMPONENTNAME = 'atto_charmap', ['Õ', 'Õ', true, 'otilde_caps'], ['Ö', 'Ö', true, 'odiaeresis_caps'], ['Ø', 'Ø', true, 'oslash_caps'], + ['Ō', 'Ō', true, 'omacron_caps'], ['Œ', 'Œ', true, 'ligatureoe_caps'], ['Š', 'Š', true, 'scaron_caps'], ['Ù', 'Ù', true, 'ugrave_caps'], ['Ú', 'Ú', true, 'uacute_caps'], ['Û', 'Û', true, 'ucircumflex_caps'], ['Ü', 'Ü', true, 'udiaeresis_caps'], + ['Ū', 'Ū', true, 'umacron_caps'], ['Ý', 'Ý', true, 'yacute_caps'], ['Ÿ', 'Ÿ', true, 'ydiaeresis_caps'], ['Þ', 'Þ', true, 'thorn_caps'], @@ -180,16 +186,19 @@ var COMPONENTNAME = 'atto_charmap', ['ã', 'ã', true, 'atilde'], ['ä', 'ä', true, 'adiaeresis'], ['å', 'å', true, 'aringabove'], + ['ā', 'ā', true, 'amacron'], ['æ', 'æ', true, 'ligatureae'], ['ç', 'ç', true, 'ccedilla'], ['è', 'è', true, 'egrave'], ['é', 'é', true, 'eacute'], ['ê', 'ê', true, 'ecircumflex'], ['ë', 'ë', true, 'ediaeresis'], + ['ē', 'ē', true, 'emacron'], ['ì', 'ì', true, 'igrave'], ['í', 'í', true, 'iacute'], ['î', 'î', true, 'icircumflex'], ['ï', 'ï', true, 'idiaeresis'], + ['ī', 'ī', true, 'imacron'], ['ð', 'ð', true, 'eth'], ['ñ', 'ñ', true, 'ntilde'], ['ò', 'ò', true, 'ograve'], @@ -198,12 +207,14 @@ var COMPONENTNAME = 'atto_charmap', ['õ', 'õ', true, 'otilde'], ['ö', 'ö', true, 'odiaeresis'], ['ø', 'ø', true, 'oslash'], + ['ō', 'ō', true, 'omacron'], ['œ', 'œ', true, 'ligatureoe'], ['š', 'š', true, 'scaron'], ['ù', 'ù', true, 'ugrave'], ['ú', 'ú', true, 'uacute'], ['û', 'û', true, 'ucircumflex'], ['ü', 'ü', true, 'udiaeresis'], + ['ū', 'ū', true, 'umacron'], ['ý', 'ý', true, 'yacute'], ['þ', 'þ', true, 'thorn'], ['ÿ', 'ÿ', true, 'ydiaeresis'], diff --git a/lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button-min.js b/lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button-min.js index 33926cdd721..77b74493b3b 100644 --- a/lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button-min.js +++ b/lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button-min.js @@ -1,2 +1,2 @@ -YUI.add("moodle-atto_charmap-button",function(e,t){var n="atto_charmap",r={BUTTON:"atto_charmap_character",CHARMAP:"atto_charmap_selector"},i=[[" "," ",!0,"nobreakspace"],["&","&",!0,"ampersand"],[""",""",!0,"quotationmark"],["¢","¢",!0,"centsign"],["€","€",!0,"eurosign"],["£","£",!0,"poundsign"],["¥","¥",!0,"yensign"],["©","©",!0,"copyrightsign"],["®","®",!0,"registeredsign"],["™","™",!0,"trademarksign"],["‰","‰",!0,"permillesign"],["µ","µ",!0,"microsign"],["·","·",!0,"middledot"],["•","•",!0,"bullet"],["…","…",!0,"threedotleader"],["′","′",!0,"minutesfeet"],["″","″",!0,"secondsinches"],["§","§",!0,"sectionsign"],["¶","¶",!0,"paragraphsign"],["ß","ß",!0,"sharpsesszed"],["‹","‹",!0,"singleleftpointinganglequotationmark"],["›","›",!0,"singlerightpointinganglequotationmark"],["«","«",!0,"leftpointingguillemet"],["»","»",!0,"rightpointingguillemet"],["‘","‘",!0,"leftsinglequotationmark"],["’","’",!0,"rightsinglequotationmark"],["“","“",!0,"leftdoublequotationmark"],["”","”",!0,"rightdoublequotationmark"],["‚","‚",!0,"singlelow9quotationmark"],["„","„",!0,"doublelow9quotationmark"],["<","<",!0,"lessthansign"],[">",">",!0,"greaterthansign"],["≤","≤",!0,"lessthanorequalto"],["≥","≥",!0,"greaterthanorequalto"],["–","–",!0,"endash"],["—","—",!0,"emdash"],["¯","¯",!0,"macron"],["‾","‾",!0,"overline"],["¤","¤",!0,"currencysign"],["¦","¦",!0,"brokenbar"],["¨","¨",!0,"diaeresis"],["¡","¡",!0,"invertedexclamationmark"],["¿","¿",!0,"turnedquestionmark"],["ˆ","ˆ",!0,"circumflexaccent"],["˜","˜",!0,"smalltilde"],["°","°",!0,"degreesign"],["−","−",!0,"minussign"],["±","±",!0,"plusminussign"],["÷","÷",!0,"divisionsign"],["⁄","⁄",!0,"fractionslash"],["×","×",!0,"multiplicationsign"],["¹","¹",!0,"superscriptone"],["²","²",!0,"superscripttwo"],["³","³",!0,"superscriptthree"],["¼","¼",!0,"fractiononequarter"],["½","½",!0,"fractiononehalf"],["¾","¾",!0,"fractionthreequarters"],["ƒ","ƒ",!0,"functionflorin"],["∫","∫",!0,"integral"],["∑","∑",!0,"narysumation"],["∞","∞",!0,"infinity"],["√","√",!0,"squareroot"],["∼","∼",!1,"similarto"],["≅","≅",!1,"approximatelyequalto"],["≈","≈",!0,"almostequalto"],["≠","≠",!0,"notequalto"],["≡","≡",!0,"identicalto"],["∈","∈",!1,"elementof"],["∉","∉",!1,"notanelementof"],["∋","∋",!1,"containsasmember"],["∏","∏",!0,"naryproduct"],["∧","∧",!1,"logicaland"],["∨","∨",!1,"logicalor"],["¬","¬",!0,"notsign"],["∩","∩",!0,"intersection"],["∪","∪",!1,"union"],["∂","∂",!0,"partialdifferential"],["∀","∀",!1,"forall"],["∃","∃",!1,"thereexists"],["∅","∅",!1,"diameter"],["∇","∇",!1,"backwarddifference"],["∗","∗",!1,"asteriskoperator"],["∝","∝",!1,"proportionalto"],["∠","∠",!1,"angle"],["´","´",!0,"acuteaccent"],["¸","¸",!0,"cedilla"],["ª","ª",!0,"feminineordinalindicator"],["º","º",!0,"masculineordinalindicator"],["†","†",!0,"dagger"],["‡","‡",!0,"doubledagger"],["À","À",!0,"agrave_caps"],["Á","Á",!0,"aacute_caps"],["Â","Â",!0,"acircumflex_caps"],["Ã","Ã",!0,"atilde_caps"],["Ä","Ä",!0,"adiaeresis_caps"],["Å","Å",!0,"aringabove_caps"],["Æ","Æ",!0,"ligatureae_caps"],["Ç","Ç",!0,"ccedilla_caps"],["È","È",!0,"egrave_caps"],["É","É",!0,"eacute_caps"],["Ê","Ê",!0,"ecircumflex_caps"],["Ë","Ë",!0,"ediaeresis_caps"],["Ì","Ì",!0,"igrave_caps"],["Í","Í",!0,"iacute_caps"],["Î","Î",!0,"icircumflex_caps"],["Ï","Ï",!0,"idiaeresis_caps"],["Ð","Ð",!0,"eth_caps"],["Ñ","Ñ",!0,"ntilde_caps"],["Ò","Ò",!0,"ograve_caps"],["Ó","Ó",!0,"oacute_caps"],["Ô","Ô",!0,"ocircumflex_caps"],["Õ","Õ",!0,"otilde_caps"],["Ö","Ö",!0,"odiaeresis_caps"],["Ø","Ø",!0,"oslash_caps"],["Œ","Œ",!0,"ligatureoe_caps"],["Š","Š",!0,"scaron_caps"],["Ù","Ù",!0,"ugrave_caps"],["Ú","Ú",!0,"uacute_caps"],["Û","Û",!0,"ucircumflex_caps"],["Ü","Ü",!0,"udiaeresis_caps"],["Ý","Ý",!0,"yacute_caps"],["Ÿ","Ÿ",!0,"ydiaeresis_caps"],["Þ","Þ",!0,"thorn_caps"],["à","à",!0,"agrave"],["á","á",!0,"aacute"],["â","â",!0,"acircumflex"],["ã","ã",!0,"atilde"],["ä","ä",!0,"adiaeresis"],["å","å",!0,"aringabove"],["æ","æ",!0,"ligatureae"],["ç","ç",!0,"ccedilla"],["è","è",!0,"egrave"],["é","é",!0,"eacute"],["ê","ê",!0,"ecircumflex"],["ë","ë",!0,"ediaeresis"],["ì","ì",!0,"igrave"],["í","í",!0,"iacute"],["î","î",!0,"icircumflex"],["ï","ï",!0,"idiaeresis"],["ð","ð",!0,"eth"],["ñ","ñ",!0,"ntilde"],["ò","ò",!0,"ograve"],["ó","ó",!0,"oacute"],["ô","ô",!0,"ocircumflex"],["õ","õ",!0,"otilde"],["ö","ö",!0,"odiaeresis"],["ø","ø",!0,"oslash"],["œ","œ",!0,"ligatureoe"],["š" -,"š",!0,"scaron"],["ù","ù",!0,"ugrave"],["ú","ú",!0,"uacute"],["û","û",!0,"ucircumflex"],["ü","ü",!0,"udiaeresis"],["ý","ý",!0,"yacute"],["þ","þ",!0,"thorn"],["ÿ","ÿ",!0,"ydiaeresis"],["Α","Α",!0,"alpha_caps"],["Β","Β",!0,"beta_caps"],["Γ","Γ",!0,"gamma_caps"],["Δ","Δ",!0,"delta_caps"],["Ε","Ε",!0,"epsilon_caps"],["Ζ","Ζ",!0,"zeta_caps"],["Η","Η",!0,"eta_caps"],["Θ","Θ",!0,"theta_caps"],["Ι","Ι",!0,"iota_caps"],["Κ","Κ",!0,"kappa_caps"],["Λ","Λ",!0,"lambda_caps"],["Μ","Μ",!0,"mu_caps"],["Ν","Ν",!0,"nu_caps"],["Ξ","Ξ",!0,"xi_caps"],["Ο","Ο",!0,"omicron_caps"],["Π","Π",!0,"pi_caps"],["Ρ","Ρ",!0,"rho_caps"],["Σ","Σ",!0,"sigma_caps"],["Τ","Τ",!0,"tau_caps"],["Υ","Υ",!0,"upsilon_caps"],["Φ","Φ",!0,"phi_caps"],["Χ","Χ",!0,"chi_caps"],["Ψ","Ψ",!0,"psi_caps"],["Ω","Ω",!0,"omega_caps"],["α","α",!0,"alpha"],["β","β",!0,"beta"],["γ","γ",!0,"gamma"],["δ","δ",!0,"delta"],["ε","ε",!0,"epsilon"],["ζ","ζ",!0,"zeta"],["η","η",!0,"eta"],["θ","θ",!0,"theta"],["ι","ι",!0,"iota"],["κ","κ",!0,"kappa"],["λ","λ",!0,"lambda"],["μ","μ",!0,"mu"],["ν","ν",!0,"nu"],["ξ","ξ",!0,"xi"],["ο","ο",!0,"omicron"],["π","π",!0,"pi"],["ρ","ρ",!0,"rho"],["ς","ς",!0,"finalsigma"],["σ","σ",!0,"sigma"],["τ","τ",!0,"tau"],["υ","υ",!0,"upsilon"],["φ","φ",!0,"phi"],["χ","χ",!0,"chi"],["ψ","ψ",!0,"psi"],["ω","ω",!0,"omega"],["ℵ","ℵ",!1,"alefsymbol"],["ϖ","ϖ",!1,"pisymbol"],["ℜ","ℜ",!1,"realpartsymbol"],["ϑ","ϑ",!1,"thetasymbol"],["ϒ","ϒ",!1,"upsilonhooksymbol"],["℘","℘",!1,"weierstrassp"],["ℑ","ℑ",!1,"imaginarypart"],["←","←",!0,"leftwardsarrow"],["↑","↑",!0,"upwardsarrow"],["→","→",!0,"rightwardsarrow"],["↓","↓",!0,"downwardsarrow"],["↔","↔",!0,"leftrightarrow"],["↵","↵",!1,"carriagereturn"],["⇐","⇐",!1,"leftwardsdoublearrow"],["⇑","⇑",!1,"upwardsdoublearrow"],["⇒","⇒",!1,"rightwardsdoublearrow"],["⇓","⇓",!1,"downwardsdoublearrow"],["⇔","⇔",!1,"leftrightdoublearrow"],["∴","∴",!1,"therefore"],["⊂","⊂",!1,"subsetof"],["⊃","⊃",!1,"supersetof"],["⊄","⊄",!1,"notasubsetof"],["⊆","⊆",!1,"subsetoforequalto"],["⊇","⊇",!1,"supersetoforequalto"],["⊕","⊕",!1,"circledplus"],["⊗","⊗",!1,"circledtimes"],["⊥","⊥",!1,"perpendicular"],["⋅","⋅",!1,"dotoperator"],["⌈","⌈",!1,"leftceiling"],["⌉","⌉",!1,"rightceiling"],["⌊","⌊",!1,"leftfloor"],["⌋","⌋",!1,"rightfloor"],["⟨","〈",!1,"leftpointinganglebracket"],["⟩","〉",!1,"rightpointinganglebracket"],["◊","◊",!0,"lozenge"],["♠","♠",!0,"blackspadesuit"],["♣","♣",!0,"blackclubsuit"],["♥","♥",!0,"blackheartsuit"],["♦","♦",!0,"blackdiamondsuit"],[" "," ",!1,"enspace"],[" "," ",!1,"emspace"],[" "," ",!1,"thinspace"],["‌","‌",!1,"zerowidthnonjoiner"],["‍","‍",!1,"zerowidthjoiner"],["‎","‎",!1,"lefttorightmark"],["‏","‏",!1,"righttoleftmark"],["­","­",!1,"softhyphen"]];e.namespace("M.atto_charmap").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{_currentSelection:null,initializer:function(){this.addButton({icon:"e/special_character",callback:this._displayDialogue})},_displayDialogue:function(){this._currentSelection=this.get("host").getSelection();if(this._currentSelection===!1)return;var e=this.getDialogue({headerContent:M.util.get_string("insertcharacter",n),focusAfterHide:!0},!0);e.set("bodyContent",this._getDialogueContent()).show()},_getDialogueContent:function(){var t=e.Handlebars.compile('
{{#each CHARMAP}}{{#if this.[2]}}{{/if}}{{/each}}
'),s=e.Node.create(t({component:n,CSS:r,CHARMAP:i}));return s.delegate("click",this._insertChar,"."+r.BUTTON,this),s},_insertChar:function(e){var t=e.target.getData("character");this.getDialogue({focusAfterHide:null}).hide();var n=this.get("host");n.setSelection(this._currentSelection),n.insertContentAtFocusPoint(t),this.markUpdated()}})},"@VERSION@",{requires:["moodle-editor_atto-plugin"]}); +YUI.add("moodle-atto_charmap-button",function(e,t){var n="atto_charmap",r={BUTTON:"atto_charmap_character",CHARMAP:"atto_charmap_selector"},i=[[" "," ",!0,"nobreakspace"],["&","&",!0,"ampersand"],[""",""",!0,"quotationmark"],["‽","‽",!0,"interrobang"],["¢","¢",!0,"centsign"],["€","€",!0,"eurosign"],["£","£",!0,"poundsign"],["¥","¥",!0,"yensign"],["©","©",!0,"copyrightsign"],["®","®",!0,"registeredsign"],["™","™",!0,"trademarksign"],["‰","‰",!0,"permillesign"],["µ","µ",!0,"microsign"],["·","·",!0,"middledot"],["•","•",!0,"bullet"],["…","…",!0,"threedotleader"],["′","′",!0,"minutesfeet"],["″","″",!0,"secondsinches"],["§","§",!0,"sectionsign"],["¶","¶",!0,"paragraphsign"],["ß","ß",!0,"sharpsesszed"],["‹","‹",!0,"singleleftpointinganglequotationmark"],["›","›",!0,"singlerightpointinganglequotationmark"],["«","«",!0,"leftpointingguillemet"],["»","»",!0,"rightpointingguillemet"],["‘","‘",!0,"leftsinglequotationmark"],["’","’",!0,"rightsinglequotationmark"],["“","“",!0,"leftdoublequotationmark"],["”","”",!0,"rightdoublequotationmark"],["‚","‚",!0,"singlelow9quotationmark"],["„","„",!0,"doublelow9quotationmark"],["<","<",!0,"lessthansign"],[">",">",!0,"greaterthansign"],["≤","≤",!0,"lessthanorequalto"],["≥","≥",!0,"greaterthanorequalto"],["–","–",!0,"endash"],["—","—",!0,"emdash"],["¯","¯",!0,"macron"],["‾","‾",!0,"overline"],["¤","¤",!0,"currencysign"],["¦","¦",!0,"brokenbar"],["¨","¨",!0,"diaeresis"],["¡","¡",!0,"invertedexclamationmark"],["¿","¿",!0,"turnedquestionmark"],["ˆ","ˆ",!0,"circumflexaccent"],["˜","˜",!0,"smalltilde"],["°","°",!0,"degreesign"],["−","−",!0,"minussign"],["±","±",!0,"plusminussign"],["÷","÷",!0,"divisionsign"],["⁄","⁄",!0,"fractionslash"],["×","×",!0,"multiplicationsign"],["¹","¹",!0,"superscriptone"],["²","²",!0,"superscripttwo"],["³","³",!0,"superscriptthree"],["¼","¼",!0,"fractiononequarter"],["½","½",!0,"fractiononehalf"],["¾","¾",!0,"fractionthreequarters"],["ƒ","ƒ",!0,"functionflorin"],["∫","∫",!0,"integral"],["∑","∑",!0,"narysumation"],["∞","∞",!0,"infinity"],["√","√",!0,"squareroot"],["∼","∼",!1,"similarto"],["≅","≅",!1,"approximatelyequalto"],["≈","≈",!0,"almostequalto"],["≠","≠",!0,"notequalto"],["≡","≡",!0,"identicalto"],["∈","∈",!1,"elementof"],["∉","∉",!1,"notanelementof"],["∋","∋",!1,"containsasmember"],["∏","∏",!0,"naryproduct"],["∧","∧",!1,"logicaland"],["∨","∨",!1,"logicalor"],["¬","¬",!0,"notsign"],["∩","∩",!0,"intersection"],["∪","∪",!1,"union"],["∂","∂",!0,"partialdifferential"],["∀","∀",!1,"forall"],["∃","∃",!1,"thereexists"],["∅","∅",!1,"diameter"],["∇","∇",!1,"backwarddifference"],["∗","∗",!1,"asteriskoperator"],["∝","∝",!1,"proportionalto"],["∠","∠",!1,"angle"],["´","´",!0,"acuteaccent"],["¸","¸",!0,"cedilla"],["ª","ª",!0,"feminineordinalindicator"],["º","º",!0,"masculineordinalindicator"],["†","†",!0,"dagger"],["‡","‡",!0,"doubledagger"],["À","À",!0,"agrave_caps"],["Á","Á",!0,"aacute_caps"],["Â","Â",!0,"acircumflex_caps"],["Ã","Ã",!0,"atilde_caps"],["Ä","Ä",!0,"adiaeresis_caps"],["Å","Å",!0,"aringabove_caps"],["Ā","Ā",!0,"amacron_caps"],["Æ","Æ",!0,"ligatureae_caps"],["Ç","Ç",!0,"ccedilla_caps"],["È","È",!0,"egrave_caps"],["É","É",!0,"eacute_caps"],["Ê","Ê",!0,"ecircumflex_caps"],["Ë","Ë",!0,"ediaeresis_caps"],["Ē","Ē",!0,"emacron_caps"],["Ì","Ì",!0,"igrave_caps"],["Í","Í",!0,"iacute_caps"],["Î","Î",!0,"icircumflex_caps"],["Ï","Ï",!0,"idiaeresis_caps"],["Ī","Ī",!0,"imacron_caps"],["Ð","Ð",!0,"eth_caps"],["Ñ","Ñ",!0,"ntilde_caps"],["Ò","Ò",!0,"ograve_caps"],["Ó","Ó",!0,"oacute_caps"],["Ô","Ô",!0,"ocircumflex_caps"],["Õ","Õ",!0,"otilde_caps"],["Ö","Ö",!0,"odiaeresis_caps"],["Ø","Ø",!0,"oslash_caps"],["Ō","Ō",!0,"omacron_caps"],["Œ","Œ",!0,"ligatureoe_caps"],["Š","Š",!0,"scaron_caps"],["Ù","Ù",!0,"ugrave_caps"],["Ú","Ú",!0,"uacute_caps"],["Û","Û",!0,"ucircumflex_caps"],["Ü","Ü",!0,"udiaeresis_caps"],["Ū","Ū",!0,"umacron_caps"],["Ý","Ý",!0,"yacute_caps"],["Ÿ","Ÿ",!0,"ydiaeresis_caps"],["Þ","Þ",!0,"thorn_caps"],["à","à",!0,"agrave"],["á","á",!0,"aacute"],["â","â",!0,"acircumflex"],["ã","ã",!0,"atilde"],["ä","ä",!0,"adiaeresis"],["å","å",!0,"aringabove"],["ā","ā",!0,"amacron"],["æ","æ",!0,"ligatureae"],["ç","ç",!0,"ccedilla"],["è","è",!0,"egrave"],["é","é",!0,"eacute"],["ê","ê",!0,"ecircumflex"],["ë","ë",!0,"ediaeresis"],["ē","ē",!0,"emacron"],["ì","ì",!0,"igrave"],["í","í",!0,"iacute"],["î","î",!0,"icircumflex"],["ï","ï",!0,"idiaeresis"],["ī","ī",!0,"imacron" +],["ð","ð",!0,"eth"],["ñ","ñ",!0,"ntilde"],["ò","ò",!0,"ograve"],["ó","ó",!0,"oacute"],["ô","ô",!0,"ocircumflex"],["õ","õ",!0,"otilde"],["ö","ö",!0,"odiaeresis"],["ø","ø",!0,"oslash"],["ō","ō",!0,"omacron"],["œ","œ",!0,"ligatureoe"],["š","š",!0,"scaron"],["ù","ù",!0,"ugrave"],["ú","ú",!0,"uacute"],["û","û",!0,"ucircumflex"],["ü","ü",!0,"udiaeresis"],["ū","ū",!0,"umacron"],["ý","ý",!0,"yacute"],["þ","þ",!0,"thorn"],["ÿ","ÿ",!0,"ydiaeresis"],["Α","Α",!0,"alpha_caps"],["Β","Β",!0,"beta_caps"],["Γ","Γ",!0,"gamma_caps"],["Δ","Δ",!0,"delta_caps"],["Ε","Ε",!0,"epsilon_caps"],["Ζ","Ζ",!0,"zeta_caps"],["Η","Η",!0,"eta_caps"],["Θ","Θ",!0,"theta_caps"],["Ι","Ι",!0,"iota_caps"],["Κ","Κ",!0,"kappa_caps"],["Λ","Λ",!0,"lambda_caps"],["Μ","Μ",!0,"mu_caps"],["Ν","Ν",!0,"nu_caps"],["Ξ","Ξ",!0,"xi_caps"],["Ο","Ο",!0,"omicron_caps"],["Π","Π",!0,"pi_caps"],["Ρ","Ρ",!0,"rho_caps"],["Σ","Σ",!0,"sigma_caps"],["Τ","Τ",!0,"tau_caps"],["Υ","Υ",!0,"upsilon_caps"],["Φ","Φ",!0,"phi_caps"],["Χ","Χ",!0,"chi_caps"],["Ψ","Ψ",!0,"psi_caps"],["Ω","Ω",!0,"omega_caps"],["α","α",!0,"alpha"],["β","β",!0,"beta"],["γ","γ",!0,"gamma"],["δ","δ",!0,"delta"],["ε","ε",!0,"epsilon"],["ζ","ζ",!0,"zeta"],["η","η",!0,"eta"],["θ","θ",!0,"theta"],["ι","ι",!0,"iota"],["κ","κ",!0,"kappa"],["λ","λ",!0,"lambda"],["μ","μ",!0,"mu"],["ν","ν",!0,"nu"],["ξ","ξ",!0,"xi"],["ο","ο",!0,"omicron"],["π","π",!0,"pi"],["ρ","ρ",!0,"rho"],["ς","ς",!0,"finalsigma"],["σ","σ",!0,"sigma"],["τ","τ",!0,"tau"],["υ","υ",!0,"upsilon"],["φ","φ",!0,"phi"],["χ","χ",!0,"chi"],["ψ","ψ",!0,"psi"],["ω","ω",!0,"omega"],["ℵ","ℵ",!1,"alefsymbol"],["ϖ","ϖ",!1,"pisymbol"],["ℜ","ℜ",!1,"realpartsymbol"],["ϑ","ϑ",!1,"thetasymbol"],["ϒ","ϒ",!1,"upsilonhooksymbol"],["℘","℘",!1,"weierstrassp"],["ℑ","ℑ",!1,"imaginarypart"],["←","←",!0,"leftwardsarrow"],["↑","↑",!0,"upwardsarrow"],["→","→",!0,"rightwardsarrow"],["↓","↓",!0,"downwardsarrow"],["↔","↔",!0,"leftrightarrow"],["↵","↵",!1,"carriagereturn"],["⇐","⇐",!1,"leftwardsdoublearrow"],["⇑","⇑",!1,"upwardsdoublearrow"],["⇒","⇒",!1,"rightwardsdoublearrow"],["⇓","⇓",!1,"downwardsdoublearrow"],["⇔","⇔",!1,"leftrightdoublearrow"],["∴","∴",!1,"therefore"],["⊂","⊂",!1,"subsetof"],["⊃","⊃",!1,"supersetof"],["⊄","⊄",!1,"notasubsetof"],["⊆","⊆",!1,"subsetoforequalto"],["⊇","⊇",!1,"supersetoforequalto"],["⊕","⊕",!1,"circledplus"],["⊗","⊗",!1,"circledtimes"],["⊥","⊥",!1,"perpendicular"],["⋅","⋅",!1,"dotoperator"],["⌈","⌈",!1,"leftceiling"],["⌉","⌉",!1,"rightceiling"],["⌊","⌊",!1,"leftfloor"],["⌋","⌋",!1,"rightfloor"],["⟨","〈",!1,"leftpointinganglebracket"],["⟩","〉",!1,"rightpointinganglebracket"],["◊","◊",!0,"lozenge"],["♠","♠",!0,"blackspadesuit"],["♣","♣",!0,"blackclubsuit"],["♥","♥",!0,"blackheartsuit"],["♦","♦",!0,"blackdiamondsuit"],[" "," ",!1,"enspace"],[" "," ",!1,"emspace"],[" "," ",!1,"thinspace"],["‌","‌",!1,"zerowidthnonjoiner"],["‍","‍",!1,"zerowidthjoiner"],["‎","‎",!1,"lefttorightmark"],["‏","‏",!1,"righttoleftmark"],["­","­",!1,"softhyphen"]];e.namespace("M.atto_charmap").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{_currentSelection:null,initializer:function(){this.addButton({icon:"e/special_character",callback:this._displayDialogue})},_displayDialogue:function(){this._currentSelection=this.get("host").getSelection();if(this._currentSelection===!1)return;var e=this.getDialogue({headerContent:M.util.get_string("insertcharacter",n),focusAfterHide:!0},!0);e.set("bodyContent",this._getDialogueContent()).show()},_getDialogueContent:function(){var t=e.Handlebars.compile('
{{#each CHARMAP}}{{#if this.[2]}}{{/if}}{{/each}}
'),s=e.Node.create(t({component:n,CSS:r,CHARMAP:i}));return s.delegate("click",this._insertChar,"."+r.BUTTON,this),s},_insertChar:function(e){var t=e.target.getData("character");this.getDialogue({focusAfterHide:null}).hide();var n=this.get("host");n.setSelection(this._currentSelection),n.insertContentAtFocusPoint(t),this.markUpdated()}})},"@VERSION@",{requires:["moodle-editor_atto-plugin"]}); diff --git a/lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button.js b/lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button.js index a0089aa8c3d..abf658ec01a 100644 --- a/lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button.js +++ b/lib/editor/atto/plugins/charmap/yui/build/moodle-atto_charmap-button/moodle-atto_charmap-button.js @@ -48,6 +48,7 @@ var COMPONENTNAME = 'atto_charmap', [' ', ' ', true, 'nobreakspace'], ['&', '&', true, 'ampersand'], ['"', '"', true, 'quotationmark'], + ['‽', '‽', true, 'interrobang'], // Finance. ['¢', '¢', true, 'centsign'], ['€', '€', true, 'eurosign'], @@ -147,16 +148,19 @@ var COMPONENTNAME = 'atto_charmap', ['Ã', 'Ã', true, 'atilde_caps'], ['Ä', 'Ä', true, 'adiaeresis_caps'], ['Å', 'Å', true, 'aringabove_caps'], + ['Ā', 'Ā', true, 'amacron_caps'], ['Æ', 'Æ', true, 'ligatureae_caps'], ['Ç', 'Ç', true, 'ccedilla_caps'], ['È', 'È', true, 'egrave_caps'], ['É', 'É', true, 'eacute_caps'], ['Ê', 'Ê', true, 'ecircumflex_caps'], ['Ë', 'Ë', true, 'ediaeresis_caps'], + ['Ē', 'Ē', true, 'emacron_caps'], ['Ì', 'Ì', true, 'igrave_caps'], ['Í', 'Í', true, 'iacute_caps'], ['Î', 'Î', true, 'icircumflex_caps'], ['Ï', 'Ï', true, 'idiaeresis_caps'], + ['Ī', 'Ī', true, 'imacron_caps'], ['Ð', 'Ð', true, 'eth_caps'], ['Ñ', 'Ñ', true, 'ntilde_caps'], ['Ò', 'Ò', true, 'ograve_caps'], @@ -165,12 +169,14 @@ var COMPONENTNAME = 'atto_charmap', ['Õ', 'Õ', true, 'otilde_caps'], ['Ö', 'Ö', true, 'odiaeresis_caps'], ['Ø', 'Ø', true, 'oslash_caps'], + ['Ō', 'Ō', true, 'omacron_caps'], ['Œ', 'Œ', true, 'ligatureoe_caps'], ['Š', 'Š', true, 'scaron_caps'], ['Ù', 'Ù', true, 'ugrave_caps'], ['Ú', 'Ú', true, 'uacute_caps'], ['Û', 'Û', true, 'ucircumflex_caps'], ['Ü', 'Ü', true, 'udiaeresis_caps'], + ['Ū', 'Ū', true, 'umacron_caps'], ['Ý', 'Ý', true, 'yacute_caps'], ['Ÿ', 'Ÿ', true, 'ydiaeresis_caps'], ['Þ', 'Þ', true, 'thorn_caps'], @@ -180,16 +186,19 @@ var COMPONENTNAME = 'atto_charmap', ['ã', 'ã', true, 'atilde'], ['ä', 'ä', true, 'adiaeresis'], ['å', 'å', true, 'aringabove'], + ['ā', 'ā', true, 'amacron'], ['æ', 'æ', true, 'ligatureae'], ['ç', 'ç', true, 'ccedilla'], ['è', 'è', true, 'egrave'], ['é', 'é', true, 'eacute'], ['ê', 'ê', true, 'ecircumflex'], ['ë', 'ë', true, 'ediaeresis'], + ['ē', 'ē', true, 'emacron'], ['ì', 'ì', true, 'igrave'], ['í', 'í', true, 'iacute'], ['î', 'î', true, 'icircumflex'], ['ï', 'ï', true, 'idiaeresis'], + ['ī', 'ī', true, 'imacron'], ['ð', 'ð', true, 'eth'], ['ñ', 'ñ', true, 'ntilde'], ['ò', 'ò', true, 'ograve'], @@ -198,12 +207,14 @@ var COMPONENTNAME = 'atto_charmap', ['õ', 'õ', true, 'otilde'], ['ö', 'ö', true, 'odiaeresis'], ['ø', 'ø', true, 'oslash'], + ['ō', 'ō', true, 'omacron'], ['œ', 'œ', true, 'ligatureoe'], ['š', 'š', true, 'scaron'], ['ù', 'ù', true, 'ugrave'], ['ú', 'ú', true, 'uacute'], ['û', 'û', true, 'ucircumflex'], ['ü', 'ü', true, 'udiaeresis'], + ['ū', 'ū', true, 'umacron'], ['ý', 'ý', true, 'yacute'], ['þ', 'þ', true, 'thorn'], ['ÿ', 'ÿ', true, 'ydiaeresis'], diff --git a/lib/editor/atto/plugins/charmap/yui/src/button/js/button.js b/lib/editor/atto/plugins/charmap/yui/src/button/js/button.js index 571ad63b6fa..cbbbf6a2211 100644 --- a/lib/editor/atto/plugins/charmap/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/charmap/yui/src/button/js/button.js @@ -46,6 +46,7 @@ var COMPONENTNAME = 'atto_charmap', [' ', ' ', true, 'nobreakspace'], ['&', '&', true, 'ampersand'], ['"', '"', true, 'quotationmark'], + ['‽', '‽', true, 'interrobang'], // Finance. ['¢', '¢', true, 'centsign'], ['€', '€', true, 'eurosign'], @@ -145,16 +146,19 @@ var COMPONENTNAME = 'atto_charmap', ['Ã', 'Ã', true, 'atilde_caps'], ['Ä', 'Ä', true, 'adiaeresis_caps'], ['Å', 'Å', true, 'aringabove_caps'], + ['Ā', 'Ā', true, 'amacron_caps'], ['Æ', 'Æ', true, 'ligatureae_caps'], ['Ç', 'Ç', true, 'ccedilla_caps'], ['È', 'È', true, 'egrave_caps'], ['É', 'É', true, 'eacute_caps'], ['Ê', 'Ê', true, 'ecircumflex_caps'], ['Ë', 'Ë', true, 'ediaeresis_caps'], + ['Ē', 'Ē', true, 'emacron_caps'], ['Ì', 'Ì', true, 'igrave_caps'], ['Í', 'Í', true, 'iacute_caps'], ['Î', 'Î', true, 'icircumflex_caps'], ['Ï', 'Ï', true, 'idiaeresis_caps'], + ['Ī', 'Ī', true, 'imacron_caps'], ['Ð', 'Ð', true, 'eth_caps'], ['Ñ', 'Ñ', true, 'ntilde_caps'], ['Ò', 'Ò', true, 'ograve_caps'], @@ -163,12 +167,14 @@ var COMPONENTNAME = 'atto_charmap', ['Õ', 'Õ', true, 'otilde_caps'], ['Ö', 'Ö', true, 'odiaeresis_caps'], ['Ø', 'Ø', true, 'oslash_caps'], + ['Ō', 'Ō', true, 'omacron_caps'], ['Œ', 'Œ', true, 'ligatureoe_caps'], ['Š', 'Š', true, 'scaron_caps'], ['Ù', 'Ù', true, 'ugrave_caps'], ['Ú', 'Ú', true, 'uacute_caps'], ['Û', 'Û', true, 'ucircumflex_caps'], ['Ü', 'Ü', true, 'udiaeresis_caps'], + ['Ū', 'Ū', true, 'umacron_caps'], ['Ý', 'Ý', true, 'yacute_caps'], ['Ÿ', 'Ÿ', true, 'ydiaeresis_caps'], ['Þ', 'Þ', true, 'thorn_caps'], @@ -178,16 +184,19 @@ var COMPONENTNAME = 'atto_charmap', ['ã', 'ã', true, 'atilde'], ['ä', 'ä', true, 'adiaeresis'], ['å', 'å', true, 'aringabove'], + ['ā', 'ā', true, 'amacron'], ['æ', 'æ', true, 'ligatureae'], ['ç', 'ç', true, 'ccedilla'], ['è', 'è', true, 'egrave'], ['é', 'é', true, 'eacute'], ['ê', 'ê', true, 'ecircumflex'], ['ë', 'ë', true, 'ediaeresis'], + ['ē', 'ē', true, 'emacron'], ['ì', 'ì', true, 'igrave'], ['í', 'í', true, 'iacute'], ['î', 'î', true, 'icircumflex'], ['ï', 'ï', true, 'idiaeresis'], + ['ī', 'ī', true, 'imacron'], ['ð', 'ð', true, 'eth'], ['ñ', 'ñ', true, 'ntilde'], ['ò', 'ò', true, 'ograve'], @@ -196,12 +205,14 @@ var COMPONENTNAME = 'atto_charmap', ['õ', 'õ', true, 'otilde'], ['ö', 'ö', true, 'odiaeresis'], ['ø', 'ø', true, 'oslash'], + ['ō', 'ō', true, 'omacron'], ['œ', 'œ', true, 'ligatureoe'], ['š', 'š', true, 'scaron'], ['ù', 'ù', true, 'ugrave'], ['ú', 'ú', true, 'uacute'], ['û', 'û', true, 'ucircumflex'], ['ü', 'ü', true, 'udiaeresis'], + ['ū', 'ū', true, 'umacron'], ['ý', 'ý', true, 'yacute'], ['þ', 'þ', true, 'thorn'], ['ÿ', 'ÿ', true, 'ydiaeresis'],