From d9c916715b37f0c6bafb55bceb300ce0947e4144 Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Fri, 22 Jun 2012 09:26:59 +0100 Subject: [PATCH] Better cross browser support for classic closure animation --- core/modules/macros/story/views/classic.js | 2 +- core/modules/startup.js | 10 +++++++++- tw5.com/tiddlers/Introduction.tid | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/core/modules/macros/story/views/classic.js b/core/modules/macros/story/views/classic.js index 25a367787..b1cef44b5 100644 --- a/core/modules/macros/story/views/classic.js +++ b/core/modules/macros/story/views/classic.js @@ -49,7 +49,7 @@ ClassicScroller.prototype.close = function(targetTiddlerNode,sourceEvent) { wrapperElement.style.height = "0px"; }); // Attach an event handler for th eend of the transition - wrapperElement.addEventListener("webkitTransitionEnd",function(event) { + wrapperElement.addEventListener($tw.browser.transitionEnd,function(event) { if(wrapperElement.parentNode) { wrapperElement.parentNode.removeChild(wrapperElement); } diff --git a/core/modules/startup.js b/core/modules/startup.js index 2f470dd84..fac0ad0ef 100644 --- a/core/modules/startup.js +++ b/core/modules/startup.js @@ -19,10 +19,18 @@ exports.startup = function() { $tw.browser.unHyphenateCss = document.body.style["background-color"] === undefined; $tw.browser.prefix = document.body.style.webkitTransform !== undefined ? "webkit" : document.body.style.MozTransform !== undefined ? "Moz" : - document.body.style.OTransform !== undefined ? "O" : null; + document.body.style.MSTransform !== undefined ? "MS" : + document.body.style.OTransform !== undefined ? "O" : ""; $tw.browser.transition = $tw.browser.prefix + "Transition"; $tw.browser.transform = $tw.browser.prefix + "Transform"; $tw.browser.transformorigin = $tw.browser.prefix + "TransformOrigin"; + $tw.browser.transitionEnd = { + "": "transitionEnd", + "O": "oTransitionEnd", + "MS": "msTransitionEnd", + "Moz": "transitionend", + "webkit": "webkitTransitionEnd" + }[$tw.browser.prefix]; } // Set up additional global objects $tw.plugins.applyMethods("global",$tw); diff --git a/tw5.com/tiddlers/Introduction.tid b/tw5.com/tiddlers/Introduction.tid index d35d665d9..1479bf186 100644 --- a/tw5.com/tiddlers/Introduction.tid +++ b/tw5.com/tiddlers/Introduction.tid @@ -3,7 +3,7 @@ tags: introduction TiddlyWiki5 gains new capabilities through a [[completely rebuilt architecture|TiddlyWikiArchitecture]] using the latest features of HTML5 and node.js. It runs natively under node.js, and can also use its own components to construct a version of itself that works entirely within the browser, just as TiddlyWiki has always done. -You can modify this wiki, and then download a copy by clicking this button: +If you're running Google Chrome Canary you can modify this wiki, and then download a copy by clicking this button: <> You can download a static copy of the tiddlers that are currently displayed in this wiki by clicking this button: <>