From 9769ba0d647830aa54c7af8e3c17171a130d076d Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Wed, 24 Aug 2011 10:31:21 -0400 Subject: [PATCH] Rename UIevents as MathEvents --- .../extensions/{UIevents.js => MathEvents.js} | 32 +++++++++---------- unpacked/extensions/MathMenu.js | 6 ++-- unpacked/extensions/MathZoom.js | 6 ++-- .../jax/output/HTML-CSS/autoload/maction.js | 7 ++-- unpacked/jax/output/HTML-CSS/jax.js | 8 ++--- unpacked/jax/output/NativeMML/jax.js | 8 ++--- 6 files changed, 34 insertions(+), 33 deletions(-) rename unpacked/extensions/{UIevents.js => MathEvents.js} (95%) diff --git a/unpacked/extensions/UIevents.js b/unpacked/extensions/MathEvents.js similarity index 95% rename from unpacked/extensions/UIevents.js rename to unpacked/extensions/MathEvents.js index 65d3fa0eb..bbd722f02 100644 --- a/unpacked/extensions/UIevents.js +++ b/unpacked/extensions/MathEvents.js @@ -1,6 +1,6 @@ /************************************************************* * - * MathJax/extensions/UIevents.js + * MathJax/extensions/MathEvents.js * * Implements the event handlers needed by the output jax to perform * menu, hover, and other events. @@ -26,7 +26,7 @@ var VERSION = "1.1"; var EXTENSION = MathJax.Extension; - var UI = EXTENSION.UIevents = {version: VERSION}; + var ME = EXTENSION.MathEvents = {version: VERSION}; var SETTINGS = HUB.config.menuSettings; @@ -59,7 +59,7 @@ // // Common event-handling code // - var EVENT = UI.Event = { + var EVENT = ME.Event = { LEFTBUTTON: 0, // the event.button value for left button RIGHTBUTTON: 2, // the event.button value for right button @@ -114,8 +114,8 @@ // // Remove selections, remove hover fades // - if (UI.msieEventBug) {event = window.event} - if (UI.safariContextMenuBug) {setTimeout("window.getSelection().empty()",0)} + if (ME.msieEventBug) {event = window.event} + if (ME.safariContextMenuBug) {setTimeout("window.getSelection().empty()",0)} if (document.selection) {setTimeout("document.selection.empty()",0)} HOVER.ClearHoverTimer(); if (jax.hover) { @@ -158,7 +158,7 @@ var show = (JAX.config.showMathMenu != null ? JAX : HUB).config.showMathMenu; if (show) { if (SETTINGS.context === "MathJax") { - if (!UI.noContextMenuBug || event.button !== EVENT.RIGHTBUTTON) return; + if (!ME.noContextMenuBug || event.button !== EVENT.RIGHTBUTTON) return; } else { if (!event[EVENT.MENUKEY] || event.button !== EVENT.LEFTBUTTON) return; } @@ -171,7 +171,7 @@ // // Handle hover "discoverability" // - var HOVER = UI.Hover = { + var HOVER = ME.Hover = { delay: 500, // time required to be considered a hover frame: {x: 3.5, y: 5, d: 1}, // frame padding and thickness button: { @@ -256,7 +256,7 @@ bbox = JAX.getHoverBBox(jax,span,math), show = (JAX.config.showMathMenu != null ? JAX : HUB).config.showMathMenu; var dx = this.frame.x, dy = this.frame.y, dd = this.frame.d; // frame size - if (UI.msieBorderWidthBug) {dd = 0} + if (ME.msieBorderWidthBug) {dd = 0} jax.hover = {opacity:0, id: jax.inputID+"-Hover"}; // // The frame and menu button @@ -393,7 +393,7 @@ // Use double-tap-and-hold as a replacement for context menu event. // Use double-tap as a replacement for double click. // - var TOUCH = UI.Touch = { + var TOUCH = ME.Touch = { last: 0, // time of last tap event delay: 500, // delay time for double-click @@ -454,22 +454,22 @@ HUB.Browser.Select({ MSIE: function (browser) { var mode = (document.documentMode||0); - UI.msieBorderWidthBug = (document.compatMode === "BackCompat"); // borders are inside offsetWidth/Height - UI.msieEventBug = browser.isIE9; // must get event from window even though event is passed + ME.msieBorderWidthBug = (document.compatMode === "BackCompat"); // borders are inside offsetWidth/Height + ME.msieEventBug = browser.isIE9; // must get event from window even though event is passed if (mode < 9) {EVENT.LEFTBUTTON = 1} // IE < 9 has wrong event.button values }, Safari: function (browser) { - UI.safariContextMenuBug = true; // selection can be started by contextmenu event + ME.safariContextMenuBug = true; // selection can be started by contextmenu event }, Konqueror: function (browser) { - UI.noContextMenuBug = true; // doesn't produce contextmenu event + ME.noContextMenuBug = true; // doesn't produce contextmenu event } }); // // Get configuration from user // - CONFIG = HUB.CombineConfig("UIevents",CONFIG); + CONFIG = HUB.CombineConfig("MathEvents",CONFIG); // // Queue the events needed for startup @@ -477,8 +477,8 @@ CALLBACK.Queue( ["getImages",HOVER], ["Styles",AJAX,CONFIG.styles], - ["Post",HUB.Startup.signal,"UIevents Ready"], - ["loadComplete",AJAX,"[MathJax]/extensions/UIevents.js"] + ["Post",HUB.Startup.signal,"MathEvents Ready"], + ["loadComplete",AJAX,"[MathJax]/extensions/MathEvents.js"] ); })(MathJax.Hub,MathJax.HTML,MathJax.Ajax,MathJax.Callback,MathJax.OutputJax); \ No newline at end of file diff --git a/unpacked/extensions/MathMenu.js b/unpacked/extensions/MathMenu.js index 8ae2df583..f4c5290a7 100644 --- a/unpacked/extensions/MathMenu.js +++ b/unpacked/extensions/MathMenu.js @@ -135,9 +135,9 @@ }); var FALSE, HOVER; - MathJax.Hub.Register.StartupHook("UIevents Ready",function () { - FALSE = MathJax.Extension.UIevents.Event.False; - HOVER = MathJax.Extension.UIevents.Hover; + MathJax.Hub.Register.StartupHook("MathEvents Ready",function () { + FALSE = MathJax.Extension.MathEvents.Event.False; + HOVER = MathJax.Extension.MathEvents.Hover; }); /*************************************************************/ diff --git a/unpacked/extensions/MathZoom.js b/unpacked/extensions/MathZoom.js index b3b3777d9..ac294d72a 100644 --- a/unpacked/extensions/MathZoom.js +++ b/unpacked/extensions/MathZoom.js @@ -58,9 +58,9 @@ }); var FALSE, HOVER; - MathJax.Hub.Register.StartupHook("UIevents Ready",function () { - FALSE = MathJax.Extension.UIevents.Event.False; - HOVER = MathJax.Extension.UIevents.Hover; + MathJax.Hub.Register.StartupHook("MathEvents Ready",function () { + FALSE = MathJax.Extension.MathEvents.Event.False; + HOVER = MathJax.Extension.MathEvents.Hover; }); /*************************************************************/ diff --git a/unpacked/jax/output/HTML-CSS/autoload/maction.js b/unpacked/jax/output/HTML-CSS/autoload/maction.js index c3802e8fb..f1a75f9af 100644 --- a/unpacked/jax/output/HTML-CSS/autoload/maction.js +++ b/unpacked/jax/output/HTML-CSS/autoload/maction.js @@ -111,11 +111,12 @@ MathJax.Hub.Register.StartupHook("HTML-CSS Jax Ready",function () { if (this.selection > this.data.length) {this.selection = 1} var math = this; while (math.type !== "math") {math = math.inherit} var jax = MathJax.Hub.getJaxFor(math.inputID), hover = !!jax.hover; - jax.Update(); if (hover) { + jax.Update(); + if (hover) { var span = document.getElementById(jax.inputID+"-Span"); - MathJax.Extension.UIevents.Hover.Hover(jax,span); + MathJax.Extension.MathEvents.Hover.Hover(jax,span); } - return MathJax.Extension.UIevents.Event.False(event); + return MathJax.Extension.MathEvents.Event.False(event); }, // diff --git a/unpacked/jax/output/HTML-CSS/jax.js b/unpacked/jax/output/HTML-CSS/jax.js index 7eda3ba4c..8bf97ec6f 100644 --- a/unpacked/jax/output/HTML-CSS/jax.js +++ b/unpacked/jax/output/HTML-CSS/jax.js @@ -299,14 +299,14 @@ } HUB.Startup.signal.Post("HTML-CSS Jax - no valid font"); } - this.require.push(MathJax.OutputJax.extensionDir+"/UIevents.js"); + this.require.push(MathJax.OutputJax.extensionDir+"/MathEvents.js"); }, Startup: function () { // Set up event handling - EVENT = MathJax.Extension.UIevents.Event; - TOUCH = MathJax.Extension.UIevents.Touch; - HOVER = MathJax.Extension.UIevents.Hover; + EVENT = MathJax.Extension.MathEvents.Event; + TOUCH = MathJax.Extension.MathEvents.Touch; + HOVER = MathJax.Extension.MathEvents.Hover; this.ContextMenu = EVENT.ContextMenu; this.Mousedown = EVENT.AltContextMenu; this.Mouseover = HOVER.Mouseover; diff --git a/unpacked/jax/output/NativeMML/jax.js b/unpacked/jax/output/NativeMML/jax.js index 4aa3ea66e..9dea3ddea 100644 --- a/unpacked/jax/output/NativeMML/jax.js +++ b/unpacked/jax/output/NativeMML/jax.js @@ -40,9 +40,9 @@ config: {styles: {}}, settings: HUB.config.menuSettings, Startup: function () { // Set up event handling - EVENT = MathJax.Extension.UIevents.Event; - TOUCH = MathJax.Extension.UIevents.Touch; - HOVER = MathJax.Extension.UIevents.Hover; + EVENT = MathJax.Extension.MathEvents.Event; + TOUCH = MathJax.Extension.MathEvents.Touch; + HOVER = MathJax.Extension.MathEvents.Hover; this.ContextMenu = EVENT.ContextMenu; this.Mousedown = EVENT.AltContextMenu; this.Mouseover = HOVER.Mouseover; @@ -66,7 +66,7 @@ "div.MathJax_MathContainer > span": {"text-align": align+"!important"} }); } - this.require.push(MathJax.OutputJax.extensionDir+"/UIevents.js"); + this.require.push(MathJax.OutputJax.extensionDir+"/MathEvents.js"); }, // // Set up MathPlayer for IE on the first time through.