mirror of
https://github.com/Jermolene/TiddlyWiki5
synced 2024-06-28 16:23:15 +00:00
Niceties for JSHint
This commit is contained in:
parent
3ade3397fb
commit
c11743088a
|
@ -39,7 +39,7 @@ ClassicScroller.prototype.remove = function(storyElementNode) {
|
||||||
wrapperElement.style[$tw.browser.transform] = "translateX(0px)";
|
wrapperElement.style[$tw.browser.transform] = "translateX(0px)";
|
||||||
wrapperElement.style.opacity = "1.0";
|
wrapperElement.style.opacity = "1.0";
|
||||||
wrapperElement.style.height = currHeight + "px";
|
wrapperElement.style.height = currHeight + "px";
|
||||||
wrapperElement.offsetWidth; // Force layout
|
$tw.utils.forceLayout(wrapperElement);
|
||||||
wrapperElement.style[$tw.browser.transform] = "translateX(" + window.innerWidth + "px)";
|
wrapperElement.style[$tw.browser.transform] = "translateX(" + window.innerWidth + "px)";
|
||||||
wrapperElement.style.opacity = "0.0";
|
wrapperElement.style.opacity = "0.0";
|
||||||
wrapperElement.style.height = "0px";
|
wrapperElement.style.height = "0px";
|
||||||
|
|
|
@ -74,7 +74,7 @@ SidewaysView.prototype.remove = function(storyElementNode) {
|
||||||
}
|
}
|
||||||
},true);
|
},true);
|
||||||
// Animate
|
// Animate
|
||||||
wrapperElement.offsetWidth; // Force layout
|
$tw.utils.forceLayout(wrapperElement);
|
||||||
wrapperElement.style[$tw.browser.transform] = "translateY(" + window.innerHeight + "px)";
|
wrapperElement.style[$tw.browser.transform] = "translateY(" + window.innerHeight + "px)";
|
||||||
wrapperElement.style.opacity = "0.0";
|
wrapperElement.style.opacity = "0.0";
|
||||||
wrapperElement.style.width = "0px";
|
wrapperElement.style.width = "0px";
|
||||||
|
|
|
@ -94,7 +94,7 @@ Zoomin.prototype.navigateForward = function(toStoryElement,fromStoryElement,hist
|
||||||
prevCurrentTiddler = this.currentTiddler;
|
prevCurrentTiddler = this.currentTiddler;
|
||||||
this.currentTiddler = toStoryElement;
|
this.currentTiddler = toStoryElement;
|
||||||
// Force layout
|
// Force layout
|
||||||
this.storyNode.offsetWidth;
|
$tw.utils.forceLayout(this.storyNode);
|
||||||
// Transform the target tiddler to its natural size
|
// Transform the target tiddler to its natural size
|
||||||
toStoryElement.domNode.style[$tw.browser.transition] = "-" + $tw.browser.prefix.toLowerCase() + "-transform " + d + " ease-in-out, opacity " + d + " ease-out";
|
toStoryElement.domNode.style[$tw.browser.transition] = "-" + $tw.browser.prefix.toLowerCase() + "-transform " + d + " ease-in-out, opacity " + d + " ease-out";
|
||||||
toStoryElement.domNode.style.opacity = "1.0";
|
toStoryElement.domNode.style.opacity = "1.0";
|
||||||
|
@ -102,7 +102,7 @@ Zoomin.prototype.navigateForward = function(toStoryElement,fromStoryElement,hist
|
||||||
toStoryElement.domNode.style.zIndex = "500";
|
toStoryElement.domNode.style.zIndex = "500";
|
||||||
// Transform the previous tiddler out of the way and then hide it
|
// Transform the previous tiddler out of the way and then hide it
|
||||||
if(prevCurrentTiddler && prevCurrentTiddler !== toStoryElement) {
|
if(prevCurrentTiddler && prevCurrentTiddler !== toStoryElement) {
|
||||||
var scale = titleBounds.width / sourceBounds.width;
|
scale = titleBounds.width / sourceBounds.width;
|
||||||
x = titleBounds.left - targetBounds.left - (sourceBounds.left - targetBounds.left) * scale;
|
x = titleBounds.left - targetBounds.left - (sourceBounds.left - targetBounds.left) * scale;
|
||||||
y = titleBounds.top - targetBounds.top - (sourceBounds.top - targetBounds.top) * scale;
|
y = titleBounds.top - targetBounds.top - (sourceBounds.top - targetBounds.top) * scale;
|
||||||
prevCurrentTiddler.domNode.style[$tw.browser.transition] = "-" + $tw.browser.prefix.toLowerCase() + "-transform " + d + " ease-in-out, opacity " + d + " ease-out";
|
prevCurrentTiddler.domNode.style[$tw.browser.transition] = "-" + $tw.browser.prefix.toLowerCase() + "-transform " + d + " ease-in-out, opacity " + d + " ease-out";
|
||||||
|
@ -154,8 +154,7 @@ Zoomin.prototype.remove = function(storyElement,storyElementIndex) {
|
||||||
this.currentTiddler = toStoryElement;
|
this.currentTiddler = toStoryElement;
|
||||||
}
|
}
|
||||||
// Animate them both
|
// Animate them both
|
||||||
// Force layout
|
$tw.utils.forceLayout(this.storyNode);
|
||||||
this.storyNode.offsetWidth;
|
|
||||||
// First, the tiddler we're closing
|
// First, the tiddler we're closing
|
||||||
storyElement.domNode.style[$tw.browser.transition] = "-" + $tw.browser.prefix.toLowerCase() + "-transform " + d + " ease-in-out, opacity " + d + " ease-out";
|
storyElement.domNode.style[$tw.browser.transition] = "-" + $tw.browser.prefix.toLowerCase() + "-transform " + d + " ease-in-out, opacity " + d + " ease-out";
|
||||||
storyElement.domNode.style.opacity = "0.0";
|
storyElement.domNode.style.opacity = "0.0";
|
||||||
|
|
|
@ -105,4 +105,11 @@ exports.getPassword = function(name) {
|
||||||
return localStorage.getItem("tw5-password-" + name);
|
return localStorage.getItem("tw5-password-" + name);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
Force layout of a dom node and its descendents
|
||||||
|
*/
|
||||||
|
exports.forceLayout = function(element) {
|
||||||
|
var dummy = element.offsetWidth;
|
||||||
|
};
|
||||||
|
|
||||||
})();
|
})();
|
||||||
|
|
|
@ -88,8 +88,8 @@ Modal.prototype.display = function(title) {
|
||||||
// Add the close event handler
|
// Add the close event handler
|
||||||
wrapper.addEventListener("tw-close",function(event) {
|
wrapper.addEventListener("tw-close",function(event) {
|
||||||
// Force layout and animate the modal message away
|
// Force layout and animate the modal message away
|
||||||
modalBackdrop.offsetWidth;
|
$tw.utils.forceLayout(modalBackdrop);
|
||||||
modalWrapper.offsetWidth;
|
$tw.utils.forceLayout(modalWrapper);
|
||||||
modalBackdrop.style.opacity = 0;
|
modalBackdrop.style.opacity = 0;
|
||||||
modalWrapper.style[$tw.browser.transform] = "translateY(" + window.innerHeight + "px)";
|
modalWrapper.style[$tw.browser.transform] = "translateY(" + window.innerHeight + "px)";
|
||||||
// Set up an event for the transition end
|
// Set up an event for the transition end
|
||||||
|
@ -113,8 +113,8 @@ Modal.prototype.display = function(title) {
|
||||||
modalBackdrop.style[$tw.browser.transition] = "opacity " + d + " ease-out";
|
modalBackdrop.style[$tw.browser.transition] = "opacity " + d + " ease-out";
|
||||||
modalWrapper.style[$tw.browser.transition] = "-" + $tw.browser.prefix.toLowerCase() + "-transform " + d + " ease-in-out";
|
modalWrapper.style[$tw.browser.transition] = "-" + $tw.browser.prefix.toLowerCase() + "-transform " + d + " ease-in-out";
|
||||||
// Force layout
|
// Force layout
|
||||||
modalBackdrop.offsetWidth;
|
$tw.utils.forceLayout(modalBackdrop);
|
||||||
modalWrapper.offsetWidth;
|
$tw.utils.forceLayout(modalWrapper);
|
||||||
// Set final animated styles
|
// Set final animated styles
|
||||||
modalBackdrop.style.opacity = 1;
|
modalBackdrop.style.opacity = 1;
|
||||||
modalWrapper.style[$tw.browser.transform] = "translateY(0px)";
|
modalWrapper.style[$tw.browser.transform] = "translateY(0px)";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user