mirror of
https://github.com/Jermolene/TiddlyWiki5
synced 2024-11-27 20:10:03 +00:00
3918e59cc1
* Fix popup location for tables This commit introduces the `popupAbsCoords` option to the $button widget and implements an absolut coordinate format. Coordinates for popups are stored in the format `(x,y,w,h)`. These coordinates are relative to the offset parent of the element that defines the popup. This commits adds a second format `@(x,y,w,h)`. Coordinates specified in this format a relative to the pages root element. The `popupAbsCoords` option of the $button widget enables the use of this coordinates. * Unify the declaration of the RegEx for parsing the popup-position The regular expression was declared in three locations with the same content. This commit supplies a new function `parseCoordinates` in `popup.js`. This function returns the parsed coordinates and understands the classic/absolute coordinates. This function is used in `reveal.js` and `action-popup.js` to parse the coordinates. * Add documentation for coordinate systems * Consolidate creating coordinate strings The Popup object now contains a `buildCoordinates` method that can be used to build coordinate strings. It takes an "enum" for the coordinate- system to use. This makes everything easily extensible and prevents the use of magic values. * Add tests for `parseCoordinates` and `buildCoordinates` * Add `tv-popup-abs-coords` to `collectDOMVariables` This will make the absolute coordinates available for the `DraggableWidget` and the `EventCatcherWidget`. * Add documentation for the `tv-popup-abs-coords` ... to the `DraggableWidget` and the `EventCatcherWidget`. * Fix crash when generating a static version of the TW The Popup class is not initialized in `startup.js` if `$tw.browser` is not true. After having consolidated the facilities for parsing coordinate strings into `popup.js` this breaks because the static build needs to parse coordinate stings even if no Popup module is initialized. This commit solves this problem by making `readPopupState`, `parseCoordinates` and `buildCoordinates` static methods of `popup.js`. It also adds a comment to these functions to show that these can be called safely even if the Popup-Class is not initialized.
64 lines
2.0 KiB
JavaScript
64 lines
2.0 KiB
JavaScript
/*\
|
|
title: test-popup.js
|
|
type: application/javascript
|
|
tags: [[$:/tags/test-spec]]
|
|
|
|
Tests some utility function of the Popup prototype.
|
|
|
|
\*/
|
|
(function(){
|
|
|
|
/*jslint node: true, browser: true */
|
|
/*global $tw: false */
|
|
"use strict";
|
|
|
|
describe("Popup tests", function() {
|
|
|
|
it("parseCoordinates should parse valid coordinates", function() {
|
|
var popup = require("$:/core/modules/utils/dom/popup.js");
|
|
|
|
expect(popup.parseCoordinates("(1,2,3,4)")).toEqual({absolute: false, left: 1, top: 2, width: 3, height: 4});
|
|
expect(popup.parseCoordinates("(1.5,2.6,3.7,4.8)")).toEqual({absolute: false, left: 1.5, top: 2.6, width: 3.7, height: 4.8});
|
|
expect(popup.parseCoordinates("@(1,2,3,4)")).toEqual({absolute: true, left: 1, top: 2, width: 3, height: 4});
|
|
expect(popup.parseCoordinates("@(1.5,2.6,3.7,4.8)")).toEqual({absolute: true, left: 1.5, top: 2.6, width: 3.7, height: 4.8});
|
|
});
|
|
|
|
it("parseCoordinates should not parse invalid coordinates", function() {
|
|
var popup = require("$:/core/modules/utils/dom/popup.js");
|
|
|
|
expect(popup.parseCoordinates("#(1,2,3,4)")).toEqual(false);
|
|
expect(popup.parseCoordinates("(1,2,3,4")).toEqual(false);
|
|
expect(popup.parseCoordinates("(1,2,3)")).toEqual(false);
|
|
});
|
|
|
|
it("buildCoordinates should create valid coordinates", function() {
|
|
var popup = require("$:/core/modules/utils/dom/popup.js");
|
|
|
|
var coordinates = {
|
|
left: 1.5,
|
|
top: 2.6,
|
|
width: 3.7,
|
|
height: 4.8
|
|
};
|
|
|
|
expect(popup.buildCoordinates(popup.coordinatePrefix.csOffsetParent, coordinates)).toEqual("(1.5,2.6,3.7,4.8)");
|
|
expect(popup.buildCoordinates(popup.coordinatePrefix.csAbsolute, coordinates)).toEqual("@(1.5,2.6,3.7,4.8)");
|
|
});
|
|
|
|
it("buildCoordinates should detect invalid input", function() {
|
|
var popup = require("$:/core/modules/utils/dom/popup.js");
|
|
|
|
var coordinates = {
|
|
left: "invalid",
|
|
top: 2.6,
|
|
width: 3.7,
|
|
height: 4.8
|
|
};
|
|
|
|
expect(popup.buildCoordinates(popup.coordinatePrefix.csOffsetParent, coordinates)).toEqual("(0,0,0,0)");
|
|
expect(popup.buildCoordinates("dummy", coordinates)).toEqual("(0,0,0,0)");
|
|
});
|
|
});
|
|
|
|
})();
|