Compare commits
1 Commits
v13.0.0-43
...
v13.0.0-39
| Author | SHA1 | Date | |
|---|---|---|---|
|
dc1fe7957b |
@@ -12,8 +12,12 @@
|
||||
</style>
|
||||
<button type="button" id="clearDrawingCanvas">Clear Drawing</button>
|
||||
<svg id="drawingCanvas" viewbox="0 0 100 100" width="100%"></svg>
|
||||
<script src="../yjs-dist.js"></script>
|
||||
<script src="../bower_components/d3/d3.min.js"></script>
|
||||
<script src="../../y.js"></script>
|
||||
<script src="../../../y-array/y-array.js"></script>
|
||||
<script src="../../../y-map/dist/y-map.js"></script>
|
||||
<script src="../../../y-memory/y-memory.js"></script>
|
||||
<script src="../../../y-websockets-client/y-websockets-client.js"></script>
|
||||
<script src="../bower_components/d3/d3.js"></script>
|
||||
<script src="./index.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -1,76 +1,84 @@
|
||||
/* globals Y, d3 */
|
||||
'strict mode'
|
||||
|
||||
let y = new Y({
|
||||
Y({
|
||||
db: {
|
||||
name: 'memory'
|
||||
},
|
||||
connector: {
|
||||
name: 'websockets-client',
|
||||
url: 'http://127.0.0.1:1234',
|
||||
room: 'drawing-example'
|
||||
// maxBufferLength: 100
|
||||
room: 'drawing-example',
|
||||
url: 'localhost:1234'
|
||||
},
|
||||
sourceDir: '/bower_components',
|
||||
share: {
|
||||
drawing: 'Array'
|
||||
}
|
||||
})
|
||||
}).then(function (y) {
|
||||
window.yDrawing = y
|
||||
var drawing = y.share.drawing
|
||||
var renderPath = d3.svg.line()
|
||||
.x(function (d) { return d[0] })
|
||||
.y(function (d) { return d[1] })
|
||||
.interpolate('basis')
|
||||
|
||||
window.yDrawing = y
|
||||
var drawing = y.define('drawing', Y.Array)
|
||||
var renderPath = d3.svg.line()
|
||||
.x(function (d) { return d[0] })
|
||||
.y(function (d) { return d[1] })
|
||||
.interpolate('basic')
|
||||
var svg = d3.select('#drawingCanvas')
|
||||
.call(d3.behavior.drag()
|
||||
.on('dragstart', dragstart)
|
||||
.on('drag', drag)
|
||||
.on('dragend', dragend))
|
||||
|
||||
var svg = d3.select('#drawingCanvas')
|
||||
.call(d3.behavior.drag()
|
||||
.on('dragstart', dragstart)
|
||||
.on('drag', drag)
|
||||
.on('dragend', dragend))
|
||||
|
||||
// create line from a shared array object and update the line when the array changes
|
||||
function drawLine (yarray) {
|
||||
var line = svg.append('path').datum(yarray.toArray())
|
||||
line.attr('d', renderPath)
|
||||
yarray.observe(function (event) {
|
||||
line.remove()
|
||||
line = svg.append('path').datum(yarray.toArray())
|
||||
// create line from a shared array object and update the line when the array changes
|
||||
function drawLine (yarray) {
|
||||
var line = svg.append('path').datum(yarray.toArray())
|
||||
line.attr('d', renderPath)
|
||||
})
|
||||
}
|
||||
// call drawLine every time an array is appended
|
||||
drawing.observe(function (event) {
|
||||
event.removedElements.forEach(function () {
|
||||
// if one is deleted, all will be deleted!!
|
||||
svg.selectAll('path').remove()
|
||||
})
|
||||
event.addedElements.forEach(function (path) {
|
||||
drawLine(path)
|
||||
})
|
||||
})
|
||||
// draw all existing content
|
||||
for (var i = 0; i < drawing.length; i++) {
|
||||
drawLine(drawing.get(i))
|
||||
}
|
||||
|
||||
// clear canvas on request
|
||||
document.querySelector('#clearDrawingCanvas').onclick = function () {
|
||||
drawing.delete(0, drawing.length)
|
||||
}
|
||||
|
||||
var sharedLine = null
|
||||
function dragstart () {
|
||||
drawing.insert(drawing.length, [Y.Array])
|
||||
sharedLine = drawing.get(drawing.length - 1)
|
||||
}
|
||||
|
||||
// After one dragged event is recognized, we ignore them for 33ms.
|
||||
var ignoreDrag = null
|
||||
function drag () {
|
||||
if (sharedLine != null && ignoreDrag == null) {
|
||||
ignoreDrag = window.setTimeout(function () {
|
||||
ignoreDrag = null
|
||||
}, 10)
|
||||
sharedLine.push([d3.mouse(this)])
|
||||
yarray.observe(function (event) {
|
||||
// we only implement insert events that are appended to the end of the array
|
||||
event.values.forEach(function (value) {
|
||||
line.datum().push(value)
|
||||
})
|
||||
line.attr('d', renderPath)
|
||||
})
|
||||
}
|
||||
// call drawLine every time an array is appended
|
||||
y.share.drawing.observe(function (event) {
|
||||
if (event.type === 'insert') {
|
||||
event.values.forEach(drawLine)
|
||||
} else {
|
||||
// just remove all elements (thats what we do anyway)
|
||||
svg.selectAll('path').remove()
|
||||
}
|
||||
})
|
||||
// draw all existing content
|
||||
for (var i = 0; i < drawing.length; i++) {
|
||||
drawLine(drawing.get(i))
|
||||
}
|
||||
}
|
||||
|
||||
function dragend () {
|
||||
sharedLine = null
|
||||
window.clearTimeout(ignoreDrag)
|
||||
ignoreDrag = null
|
||||
}
|
||||
// clear canvas on request
|
||||
document.querySelector('#clearDrawingCanvas').onclick = function () {
|
||||
drawing.delete(0, drawing.length)
|
||||
}
|
||||
|
||||
var sharedLine = null
|
||||
function dragstart () {
|
||||
drawing.insert(drawing.length, [Y.Array])
|
||||
sharedLine = drawing.get(drawing.length - 1)
|
||||
}
|
||||
|
||||
// After one dragged event is recognized, we ignore them for 33ms.
|
||||
var ignoreDrag = null
|
||||
function drag () {
|
||||
if (sharedLine != null && ignoreDrag == null) {
|
||||
ignoreDrag = window.setTimeout(function () {
|
||||
ignoreDrag = null
|
||||
}, 33)
|
||||
sharedLine.push([d3.mouse(this)])
|
||||
}
|
||||
}
|
||||
|
||||
function dragend () {
|
||||
sharedLine = null
|
||||
window.clearTimeout(ignoreDrag)
|
||||
ignoreDrag = null
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
</head>
|
||||
<script src="../yjs-dist.js"></script>
|
||||
<script src="../bower_components/d3/d3.min.js"></script>
|
||||
<script src="./index.js"></script>
|
||||
<style>
|
||||
magic-drawing .drawingCanvas path {
|
||||
fill: none;
|
||||
stroke: blue;
|
||||
stroke-width: 2px;
|
||||
stroke-linejoin: round;
|
||||
stroke-linecap: round;
|
||||
}
|
||||
magic-drawing .drawingCanvas {
|
||||
width: 500px;
|
||||
height: 500px;
|
||||
cursor: default;
|
||||
padding:1px;
|
||||
border:1px solid #021a40;
|
||||
}
|
||||
magic-drawing .clearDrawingButton {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
}
|
||||
magic-drawing {
|
||||
position: relative;
|
||||
display: block;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body contenteditable="true">
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,134 +0,0 @@
|
||||
/* global Y, d3 */
|
||||
|
||||
window.onload = function () {
|
||||
window.yXmlType.bindToDom(document.body)
|
||||
}
|
||||
|
||||
window.addMagicDrawing = function addMagicDrawing () {
|
||||
let mt = document.createElement('magic-drawing')
|
||||
mt.dataset.yjsHook = 'magic-drawing'
|
||||
document.body.append(mt)
|
||||
}
|
||||
|
||||
var renderPath = d3.svg.line()
|
||||
.x(function (d) { return d[0] })
|
||||
.y(function (d) { return d[1] })
|
||||
.interpolate('basic')
|
||||
|
||||
function initDrawingBindings (type, dom) {
|
||||
dom.contentEditable = 'false'
|
||||
dom.dataset.yjsHook = 'magic-drawing'
|
||||
var drawing = type.get('drawing')
|
||||
if (drawing === undefined) {
|
||||
drawing = type.set('drawing', new Y.Array())
|
||||
}
|
||||
var canvas = dom.querySelector('.drawingCanvas')
|
||||
if (canvas == null) {
|
||||
canvas = document.createElementNS('http://www.w3.org/2000/svg', 'svg')
|
||||
canvas.setAttribute('class', 'drawingCanvas')
|
||||
canvas.setAttribute('viewbox', '0 0 100 100')
|
||||
dom.insertBefore(canvas, null)
|
||||
}
|
||||
var clearDrawingButton = dom.querySelector('.clearDrawingButton')
|
||||
if (clearDrawingButton == null) {
|
||||
clearDrawingButton = document.createElement('button')
|
||||
clearDrawingButton.setAttribute('type', 'button')
|
||||
clearDrawingButton.setAttribute('class', 'clearDrawingButton')
|
||||
clearDrawingButton.innerText = 'Clear Drawing'
|
||||
dom.insertBefore(clearDrawingButton, null)
|
||||
}
|
||||
var svg = d3.select(canvas)
|
||||
.call(d3.behavior.drag()
|
||||
.on('dragstart', dragstart)
|
||||
.on('drag', drag)
|
||||
.on('dragend', dragend))
|
||||
// create line from a shared array object and update the line when the array changes
|
||||
function drawLine (yarray, svg) {
|
||||
var line = svg.append('path').datum(yarray.toArray())
|
||||
line.attr('d', renderPath)
|
||||
yarray.observe(function (event) {
|
||||
line.remove()
|
||||
line = svg.append('path').datum(yarray.toArray())
|
||||
line.attr('d', renderPath)
|
||||
})
|
||||
}
|
||||
// call drawLine every time an array is appended
|
||||
drawing.observe(function (event) {
|
||||
event.removedElements.forEach(function () {
|
||||
// if one is deleted, all will be deleted!!
|
||||
svg.selectAll('path').remove()
|
||||
})
|
||||
event.addedElements.forEach(function (path) {
|
||||
drawLine(path, svg)
|
||||
})
|
||||
})
|
||||
// draw all existing content
|
||||
for (var i = 0; i < drawing.length; i++) {
|
||||
drawLine(drawing.get(i), svg)
|
||||
}
|
||||
|
||||
// clear canvas on request
|
||||
clearDrawingButton.onclick = function () {
|
||||
drawing.delete(0, drawing.length)
|
||||
}
|
||||
|
||||
var sharedLine = null
|
||||
function dragstart () {
|
||||
drawing.insert(drawing.length, [Y.Array])
|
||||
sharedLine = drawing.get(drawing.length - 1)
|
||||
}
|
||||
|
||||
// After one dragged event is recognized, we ignore them for 33ms.
|
||||
var ignoreDrag = null
|
||||
function drag () {
|
||||
if (sharedLine != null && ignoreDrag == null) {
|
||||
ignoreDrag = window.setTimeout(function () {
|
||||
ignoreDrag = null
|
||||
}, 10)
|
||||
sharedLine.push([d3.mouse(this)])
|
||||
}
|
||||
}
|
||||
|
||||
function dragend () {
|
||||
sharedLine = null
|
||||
window.clearTimeout(ignoreDrag)
|
||||
ignoreDrag = null
|
||||
}
|
||||
}
|
||||
|
||||
Y.XmlHook.addHook('magic-drawing', {
|
||||
fillType: function (dom, type) {
|
||||
initDrawingBindings(type, dom)
|
||||
},
|
||||
createDom: function (type) {
|
||||
const dom = document.createElement('magic-drawing')
|
||||
initDrawingBindings(type, dom)
|
||||
return dom
|
||||
}
|
||||
})
|
||||
|
||||
// initialize a shared object. This function call returns a promise!
|
||||
let y = new Y({
|
||||
connector: {
|
||||
name: 'websockets-client',
|
||||
url: 'http://127.0.0.1:1234',
|
||||
room: 'html-editor-example6'
|
||||
// maxBufferLength: 100
|
||||
}
|
||||
})
|
||||
window.yXml = y
|
||||
window.yXmlType = y.define('xml', Y.XmlFragment)
|
||||
window.undoManager = new Y.utils.UndoManager(window.yXmlType, {
|
||||
captureTimeout: 500
|
||||
})
|
||||
|
||||
document.onkeydown = function interceptUndoRedo (e) {
|
||||
if (e.keyCode === 90 && e.metaKey) {
|
||||
if (!e.shiftKey) {
|
||||
window.undoManager.undo()
|
||||
} else {
|
||||
window.undoManager.redo()
|
||||
}
|
||||
e.preventDefault()
|
||||
}
|
||||
}
|
||||
2
package-lock.json
generated
2
package-lock.json
generated
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "yjs",
|
||||
"version": "13.0.0-43",
|
||||
"version": "13.0.0-39",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "yjs",
|
||||
"version": "13.0.0-43",
|
||||
"version": "13.0.0-39",
|
||||
"description": "A framework for real-time p2p shared editing on any data",
|
||||
"main": "./y.node.js",
|
||||
"browser": "./y.js",
|
||||
|
||||
@@ -11,12 +11,12 @@ export default {
|
||||
format: 'umd'
|
||||
},
|
||||
plugins: [
|
||||
multiEntry(),
|
||||
nodeResolve({
|
||||
main: true,
|
||||
module: true,
|
||||
browser: true
|
||||
}),
|
||||
commonjs()
|
||||
commonjs(),
|
||||
multiEntry()
|
||||
]
|
||||
}
|
||||
|
||||
@@ -5,38 +5,15 @@ import { logID } from '../MessageHandler/messageToString.js'
|
||||
import YEvent from '../Util/YEvent.js'
|
||||
|
||||
class YArrayEvent extends YEvent {
|
||||
constructor (yarray, remote, transaction) {
|
||||
constructor (yarray, remote) {
|
||||
super(yarray)
|
||||
this.remote = remote
|
||||
this._transaction = transaction
|
||||
}
|
||||
get addedElements () {
|
||||
const target = this.target
|
||||
const transaction = this._transaction
|
||||
const addedElements = new Set()
|
||||
transaction.newTypes.forEach(function (type) {
|
||||
if (type._parent === target && !transaction.deletedStructs.has(type)) {
|
||||
addedElements.add(type)
|
||||
}
|
||||
})
|
||||
return addedElements
|
||||
}
|
||||
get removedElements () {
|
||||
const target = this.target
|
||||
const transaction = this._transaction
|
||||
const removedElements = new Set()
|
||||
transaction.deletedStructs.forEach(function (struct) {
|
||||
if (struct._parent === target && !transaction.newTypes.has(struct)) {
|
||||
removedElements.add(struct)
|
||||
}
|
||||
})
|
||||
return removedElements
|
||||
}
|
||||
}
|
||||
|
||||
export default class YArray extends Type {
|
||||
_callObserver (transaction, parentSubs, remote) {
|
||||
this._callEventHandler(transaction, new YArrayEvent(this, remote, transaction))
|
||||
this._callEventHandler(transaction, new YArrayEvent(this, remote))
|
||||
}
|
||||
get (pos) {
|
||||
let n = this._start
|
||||
@@ -207,12 +184,8 @@ export default class YArray extends Type {
|
||||
prevJsonIns._content.push(c)
|
||||
}
|
||||
}
|
||||
if (prevJsonIns !== null) {
|
||||
if (y !== null) {
|
||||
prevJsonIns._integrate(y)
|
||||
} else if (prevJsonIns._left === null) {
|
||||
this._start = prevJsonIns
|
||||
}
|
||||
if (prevJsonIns !== null && y !== null) {
|
||||
prevJsonIns._integrate(y)
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -241,17 +214,6 @@ export default class YArray extends Type {
|
||||
}
|
||||
this.insertAfter(left, content)
|
||||
}
|
||||
push (content) {
|
||||
let n = this._start
|
||||
let lastUndeleted = null
|
||||
while (n !== null) {
|
||||
if (!n._deleted) {
|
||||
lastUndeleted = n
|
||||
}
|
||||
n = n._right
|
||||
}
|
||||
this.insertAfter(lastUndeleted, content)
|
||||
}
|
||||
_logString () {
|
||||
const left = this._left !== null ? this._left._lastId : null
|
||||
const origin = this._origin !== null ? this._origin._lastId : null
|
||||
|
||||
@@ -55,7 +55,7 @@ class YXmlTreeWalker {
|
||||
}
|
||||
}
|
||||
do {
|
||||
if (!n._deleted && (n.constructor === YXmlFragment._YXmlElement || n.constructor === YXmlFragment) && n._start !== null) {
|
||||
if (!n._deleted && n.constructor === YXmlFragment._YXmlElement && n._start !== null) {
|
||||
// walk down in the tree
|
||||
n = n._start
|
||||
} else {
|
||||
@@ -143,23 +143,6 @@ export default class YXmlFragment extends YArray {
|
||||
}
|
||||
setDomFilter (f) {
|
||||
this._domFilter = f
|
||||
let attributes = new Map()
|
||||
if (this.getAttributes !== undefined) {
|
||||
let attrs = this.getAttributes()
|
||||
for (let key in attrs) {
|
||||
attributes.set(key, attrs[key])
|
||||
}
|
||||
}
|
||||
let result = this._domFilter(this.nodeName, new Map(attributes))
|
||||
if (result === null) {
|
||||
this._delete(this._y)
|
||||
} else {
|
||||
attributes.forEach((value, key) => {
|
||||
if (!result.has(key)) {
|
||||
this.removeAttribute(key)
|
||||
}
|
||||
})
|
||||
}
|
||||
this.forEach(xml => {
|
||||
xml.setDomFilter(f)
|
||||
})
|
||||
@@ -271,7 +254,9 @@ export default class YXmlFragment extends YArray {
|
||||
})
|
||||
// Apply Y.Xml events to dom
|
||||
this.observeDeep(events => {
|
||||
reflectChangesOnDom.call(this, events, _document)
|
||||
this._mutualExclude(() => {
|
||||
reflectChangesOnDom.call(this, events, _document)
|
||||
})
|
||||
})
|
||||
// Apply Dom changes on Y.Xml
|
||||
if (typeof MutationObserver !== 'undefined') {
|
||||
|
||||
@@ -24,11 +24,6 @@ export default class YXmlHook extends YMap {
|
||||
}
|
||||
return this._dom
|
||||
}
|
||||
_unbindFromDom () {
|
||||
this._dom._yxml = null
|
||||
this._yxml = null
|
||||
// TODO: cleanup hook?
|
||||
}
|
||||
_fromBinary (y, decoder) {
|
||||
const missing = super._fromBinary(y, decoder)
|
||||
this.hookName = decoder.readVarString()
|
||||
|
||||
@@ -68,6 +68,7 @@ export function afterTransactionSelectionFixer (y, transaction, remote) {
|
||||
}
|
||||
}
|
||||
if (shouldUpdate) {
|
||||
console.info('updating selection!!')
|
||||
browserSelection.setBaseAndExtent(
|
||||
anchorNode,
|
||||
anchorOffset,
|
||||
|
||||
@@ -174,7 +174,7 @@ export function reflectChangesOnDom (events, _document) {
|
||||
// let anchorViewPosition = getAnchorViewPosition(yxml._scrollElement)
|
||||
if (yxml.constructor === YXmlText) {
|
||||
yxml._dom.nodeValue = yxml.toString()
|
||||
} else if (event.attributesChanged !== undefined) {
|
||||
} else {
|
||||
// update attributes
|
||||
event.attributesChanged.forEach(attributeName => {
|
||||
const value = yxml.getAttribute(attributeName)
|
||||
@@ -193,27 +193,19 @@ export function reflectChangesOnDom (events, _document) {
|
||||
* only in the attributes (above)
|
||||
*/
|
||||
if (event.childListChanged && yxml.constructor !== YXmlHook) {
|
||||
let currentChild = dom.firstChild
|
||||
// create fragment of undeleted nodes
|
||||
const fragment = _document.createDocumentFragment()
|
||||
yxml.forEach(function (t) {
|
||||
let expectedChild = t.getDom(_document)
|
||||
if (expectedChild.parentNode === dom) {
|
||||
// is already attached to the dom. Look for it
|
||||
while (currentChild !== expectedChild) {
|
||||
let del = currentChild
|
||||
currentChild = currentChild.nextSibling
|
||||
dom.removeChild(del)
|
||||
}
|
||||
currentChild = currentChild.nextSibling
|
||||
} else {
|
||||
// this dom is not yet attached to dom
|
||||
dom.insertBefore(expectedChild, currentChild)
|
||||
}
|
||||
fragment.appendChild(t.getDom(_document))
|
||||
})
|
||||
while (currentChild !== null) {
|
||||
let tmp = currentChild.nextSibling
|
||||
dom.removeChild(currentChild)
|
||||
currentChild = tmp
|
||||
// remove remainding nodes
|
||||
let lastChild = dom.lastChild
|
||||
while (lastChild !== null) {
|
||||
dom.removeChild(lastChild)
|
||||
lastChild = dom.lastChild
|
||||
}
|
||||
// insert fragment of undeleted nodes
|
||||
dom.appendChild(fragment)
|
||||
}
|
||||
}
|
||||
/* TODO: smartscrolling
|
||||
|
||||
@@ -280,6 +280,7 @@ test('deep element insert', async function xml16 (t) {
|
||||
deepElement.append(boldElement)
|
||||
deepElement.append(attrElement)
|
||||
dom0.append(deepElement)
|
||||
console.log(dom0.outerHTML)
|
||||
let str0 = dom0.outerHTML
|
||||
await flushAll(t, users)
|
||||
let str1 = dom1.outerHTML
|
||||
@@ -339,6 +340,7 @@ test('Filtering remote changes', async function xmlFilteringRemote (t) {
|
||||
// check dom
|
||||
paragraph.getDom().setAttribute('malicious', 'true')
|
||||
span.getDom().setAttribute('malicious', 'true')
|
||||
console.log(xml0.toString())
|
||||
// check incoming attributes
|
||||
xml1.get(0).get(0).setAttribute('malicious', 'true')
|
||||
xml1.insert(0, [new Y.XmlElement('hideMe')])
|
||||
|
||||
107
y.node.js
107
y.node.js
@@ -1,7 +1,7 @@
|
||||
|
||||
/**
|
||||
* yjs - A framework for real-time p2p shared editing on any data
|
||||
* @version v13.0.0-43
|
||||
* @version v13.0.0-39
|
||||
* @license MIT
|
||||
*/
|
||||
|
||||
@@ -2204,38 +2204,15 @@ class YEvent {
|
||||
}
|
||||
|
||||
class YArrayEvent extends YEvent {
|
||||
constructor (yarray, remote, transaction) {
|
||||
constructor (yarray, remote) {
|
||||
super(yarray);
|
||||
this.remote = remote;
|
||||
this._transaction = transaction;
|
||||
}
|
||||
get addedElements () {
|
||||
const target = this.target;
|
||||
const transaction = this._transaction;
|
||||
const addedElements = new Set();
|
||||
transaction.newTypes.forEach(function (type) {
|
||||
if (type._parent === target && !transaction.deletedStructs.has(type)) {
|
||||
addedElements.add(type);
|
||||
}
|
||||
});
|
||||
return addedElements
|
||||
}
|
||||
get removedElements () {
|
||||
const target = this.target;
|
||||
const transaction = this._transaction;
|
||||
const removedElements = new Set();
|
||||
transaction.deletedStructs.forEach(function (struct) {
|
||||
if (struct._parent === target && !transaction.newTypes.has(struct)) {
|
||||
removedElements.add(struct);
|
||||
}
|
||||
});
|
||||
return removedElements
|
||||
}
|
||||
}
|
||||
|
||||
class YArray extends Type {
|
||||
_callObserver (transaction, parentSubs, remote) {
|
||||
this._callEventHandler(transaction, new YArrayEvent(this, remote, transaction));
|
||||
this._callEventHandler(transaction, new YArrayEvent(this, remote));
|
||||
}
|
||||
get (pos) {
|
||||
let n = this._start;
|
||||
@@ -2406,12 +2383,8 @@ class YArray extends Type {
|
||||
prevJsonIns._content.push(c);
|
||||
}
|
||||
}
|
||||
if (prevJsonIns !== null) {
|
||||
if (y !== null) {
|
||||
prevJsonIns._integrate(y);
|
||||
} else if (prevJsonIns._left === null) {
|
||||
this._start = prevJsonIns;
|
||||
}
|
||||
if (prevJsonIns !== null && y !== null) {
|
||||
prevJsonIns._integrate(y);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -2440,17 +2413,6 @@ class YArray extends Type {
|
||||
}
|
||||
this.insertAfter(left, content);
|
||||
}
|
||||
push (content) {
|
||||
let n = this._start;
|
||||
let lastUndeleted = null;
|
||||
while (n !== null) {
|
||||
if (!n._deleted) {
|
||||
lastUndeleted = n;
|
||||
}
|
||||
n = n._right;
|
||||
}
|
||||
this.insertAfter(lastUndeleted, content);
|
||||
}
|
||||
_logString () {
|
||||
const left = this._left !== null ? this._left._lastId : null;
|
||||
const origin = this._origin !== null ? this._origin._lastId : null;
|
||||
@@ -2764,7 +2726,7 @@ function reflectChangesOnDom (events, _document) {
|
||||
// let anchorViewPosition = getAnchorViewPosition(yxml._scrollElement)
|
||||
if (yxml.constructor === YXmlText) {
|
||||
yxml._dom.nodeValue = yxml.toString();
|
||||
} else if (event.attributesChanged !== undefined) {
|
||||
} else {
|
||||
// update attributes
|
||||
event.attributesChanged.forEach(attributeName => {
|
||||
const value = yxml.getAttribute(attributeName);
|
||||
@@ -2783,27 +2745,19 @@ function reflectChangesOnDom (events, _document) {
|
||||
* only in the attributes (above)
|
||||
*/
|
||||
if (event.childListChanged && yxml.constructor !== YXmlHook) {
|
||||
let currentChild = dom.firstChild;
|
||||
// create fragment of undeleted nodes
|
||||
const fragment = _document.createDocumentFragment();
|
||||
yxml.forEach(function (t) {
|
||||
let expectedChild = t.getDom(_document);
|
||||
if (expectedChild.parentNode === dom) {
|
||||
// is already attached to the dom. Look for it
|
||||
while (currentChild !== expectedChild) {
|
||||
let del = currentChild;
|
||||
currentChild = currentChild.nextSibling;
|
||||
dom.removeChild(del);
|
||||
}
|
||||
currentChild = currentChild.nextSibling;
|
||||
} else {
|
||||
// this dom is not yet attached to dom
|
||||
dom.insertBefore(expectedChild, currentChild);
|
||||
}
|
||||
fragment.appendChild(t.getDom(_document));
|
||||
});
|
||||
while (currentChild !== null) {
|
||||
let tmp = currentChild.nextSibling;
|
||||
dom.removeChild(currentChild);
|
||||
currentChild = tmp;
|
||||
// remove remainding nodes
|
||||
let lastChild = dom.lastChild;
|
||||
while (lastChild !== null) {
|
||||
dom.removeChild(lastChild);
|
||||
lastChild = dom.lastChild;
|
||||
}
|
||||
// insert fragment of undeleted nodes
|
||||
dom.appendChild(fragment);
|
||||
}
|
||||
}
|
||||
/* TODO: smartscrolling
|
||||
@@ -2985,6 +2939,7 @@ function afterTransactionSelectionFixer (y, transaction, remote) {
|
||||
}
|
||||
}
|
||||
if (shouldUpdate) {
|
||||
console.info('updating selection!!');
|
||||
browserSelection.setBaseAndExtent(
|
||||
anchorNode,
|
||||
anchorOffset,
|
||||
@@ -3797,7 +3752,7 @@ class YXmlTreeWalker {
|
||||
}
|
||||
}
|
||||
do {
|
||||
if (!n._deleted && (n.constructor === YXmlFragment._YXmlElement || n.constructor === YXmlFragment) && n._start !== null) {
|
||||
if (!n._deleted && n.constructor === YXmlFragment._YXmlElement && n._start !== null) {
|
||||
// walk down in the tree
|
||||
n = n._start;
|
||||
} else {
|
||||
@@ -3885,23 +3840,6 @@ class YXmlFragment extends YArray {
|
||||
}
|
||||
setDomFilter (f) {
|
||||
this._domFilter = f;
|
||||
let attributes = new Map();
|
||||
if (this.getAttributes !== undefined) {
|
||||
let attrs = this.getAttributes();
|
||||
for (let key in attrs) {
|
||||
attributes.set(key, attrs[key]);
|
||||
}
|
||||
}
|
||||
let result = this._domFilter(this.nodeName, new Map(attributes));
|
||||
if (result === null) {
|
||||
this._delete(this._y);
|
||||
} else {
|
||||
attributes.forEach((value, key) => {
|
||||
if (!result.has(key)) {
|
||||
this.removeAttribute(key);
|
||||
}
|
||||
});
|
||||
}
|
||||
this.forEach(xml => {
|
||||
xml.setDomFilter(f);
|
||||
});
|
||||
@@ -4013,7 +3951,9 @@ class YXmlFragment extends YArray {
|
||||
});
|
||||
// Apply Y.Xml events to dom
|
||||
this.observeDeep(events => {
|
||||
reflectChangesOnDom.call(this, events, _document);
|
||||
this._mutualExclude(() => {
|
||||
reflectChangesOnDom.call(this, events, _document);
|
||||
});
|
||||
});
|
||||
// Apply Dom changes on Y.Xml
|
||||
if (typeof MutationObserver !== 'undefined') {
|
||||
@@ -4258,11 +4198,6 @@ class YXmlHook extends YMap {
|
||||
}
|
||||
return this._dom
|
||||
}
|
||||
_unbindFromDom () {
|
||||
this._dom._yxml = null;
|
||||
this._yxml = null;
|
||||
// TODO: cleanup hook?
|
||||
}
|
||||
_fromBinary (y, decoder) {
|
||||
const missing = super._fromBinary(y, decoder);
|
||||
this.hookName = decoder.readVarString();
|
||||
|
||||
File diff suppressed because one or more lines are too long
272
y.test.js
272
y.test.js
@@ -1,8 +1,8 @@
|
||||
(function (global, factory) {
|
||||
typeof exports === 'object' && typeof module !== 'undefined' ? factory() :
|
||||
typeof define === 'function' && define.amd ? define(factory) :
|
||||
(factory());
|
||||
}(this, (function () { 'use strict';
|
||||
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
|
||||
typeof define === 'function' && define.amd ? define(['exports'], factory) :
|
||||
(factory((global['y-tests'] = {})));
|
||||
}(this, (function (exports) { 'use strict';
|
||||
|
||||
class N {
|
||||
// A created node is always red!
|
||||
@@ -2201,38 +2201,15 @@ class YEvent {
|
||||
}
|
||||
|
||||
class YArrayEvent extends YEvent {
|
||||
constructor (yarray, remote, transaction) {
|
||||
constructor (yarray, remote) {
|
||||
super(yarray);
|
||||
this.remote = remote;
|
||||
this._transaction = transaction;
|
||||
}
|
||||
get addedElements () {
|
||||
const target = this.target;
|
||||
const transaction = this._transaction;
|
||||
const addedElements = new Set();
|
||||
transaction.newTypes.forEach(function (type) {
|
||||
if (type._parent === target && !transaction.deletedStructs.has(type)) {
|
||||
addedElements.add(type);
|
||||
}
|
||||
});
|
||||
return addedElements
|
||||
}
|
||||
get removedElements () {
|
||||
const target = this.target;
|
||||
const transaction = this._transaction;
|
||||
const removedElements = new Set();
|
||||
transaction.deletedStructs.forEach(function (struct) {
|
||||
if (struct._parent === target && !transaction.newTypes.has(struct)) {
|
||||
removedElements.add(struct);
|
||||
}
|
||||
});
|
||||
return removedElements
|
||||
}
|
||||
}
|
||||
|
||||
class YArray extends Type {
|
||||
_callObserver (transaction, parentSubs, remote) {
|
||||
this._callEventHandler(transaction, new YArrayEvent(this, remote, transaction));
|
||||
this._callEventHandler(transaction, new YArrayEvent(this, remote));
|
||||
}
|
||||
get (pos) {
|
||||
let n = this._start;
|
||||
@@ -2403,12 +2380,8 @@ class YArray extends Type {
|
||||
prevJsonIns._content.push(c);
|
||||
}
|
||||
}
|
||||
if (prevJsonIns !== null) {
|
||||
if (y !== null) {
|
||||
prevJsonIns._integrate(y);
|
||||
} else if (prevJsonIns._left === null) {
|
||||
this._start = prevJsonIns;
|
||||
}
|
||||
if (prevJsonIns !== null && y !== null) {
|
||||
prevJsonIns._integrate(y);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -2437,17 +2410,6 @@ class YArray extends Type {
|
||||
}
|
||||
this.insertAfter(left, content);
|
||||
}
|
||||
push (content) {
|
||||
let n = this._start;
|
||||
let lastUndeleted = null;
|
||||
while (n !== null) {
|
||||
if (!n._deleted) {
|
||||
lastUndeleted = n;
|
||||
}
|
||||
n = n._right;
|
||||
}
|
||||
this.insertAfter(lastUndeleted, content);
|
||||
}
|
||||
_logString () {
|
||||
const left = this._left !== null ? this._left._lastId : null;
|
||||
const origin = this._origin !== null ? this._origin._lastId : null;
|
||||
@@ -2591,17 +2553,14 @@ class YText extends YArray {
|
||||
let right = this._start;
|
||||
let count = 0;
|
||||
while (right !== null) {
|
||||
const rightLen = right._deleted ? 0 : (right._length - 1);
|
||||
if (count <= pos && pos <= count + rightLen) {
|
||||
if (count <= pos && pos < count + right._length) {
|
||||
const splitDiff = pos - count;
|
||||
right = right._splitAt(this._y, splitDiff);
|
||||
right = right._splitAt(this._y, pos - count);
|
||||
left = right._left;
|
||||
count += splitDiff;
|
||||
break
|
||||
}
|
||||
if (!right._deleted) {
|
||||
count += right._length;
|
||||
}
|
||||
count += right._length;
|
||||
left = right;
|
||||
right = right._right;
|
||||
}
|
||||
@@ -2761,7 +2720,7 @@ function reflectChangesOnDom (events, _document) {
|
||||
// let anchorViewPosition = getAnchorViewPosition(yxml._scrollElement)
|
||||
if (yxml.constructor === YXmlText) {
|
||||
yxml._dom.nodeValue = yxml.toString();
|
||||
} else if (event.attributesChanged !== undefined) {
|
||||
} else {
|
||||
// update attributes
|
||||
event.attributesChanged.forEach(attributeName => {
|
||||
const value = yxml.getAttribute(attributeName);
|
||||
@@ -2780,27 +2739,19 @@ function reflectChangesOnDom (events, _document) {
|
||||
* only in the attributes (above)
|
||||
*/
|
||||
if (event.childListChanged && yxml.constructor !== YXmlHook) {
|
||||
let currentChild = dom.firstChild;
|
||||
// create fragment of undeleted nodes
|
||||
const fragment = _document.createDocumentFragment();
|
||||
yxml.forEach(function (t) {
|
||||
let expectedChild = t.getDom(_document);
|
||||
if (expectedChild.parentNode === dom) {
|
||||
// is already attached to the dom. Look for it
|
||||
while (currentChild !== expectedChild) {
|
||||
let del = currentChild;
|
||||
currentChild = currentChild.nextSibling;
|
||||
dom.removeChild(del);
|
||||
}
|
||||
currentChild = currentChild.nextSibling;
|
||||
} else {
|
||||
// this dom is not yet attached to dom
|
||||
dom.insertBefore(expectedChild, currentChild);
|
||||
}
|
||||
fragment.appendChild(t.getDom(_document));
|
||||
});
|
||||
while (currentChild !== null) {
|
||||
let tmp = currentChild.nextSibling;
|
||||
dom.removeChild(currentChild);
|
||||
currentChild = tmp;
|
||||
// remove remainding nodes
|
||||
let lastChild = dom.lastChild;
|
||||
while (lastChild !== null) {
|
||||
dom.removeChild(lastChild);
|
||||
lastChild = dom.lastChild;
|
||||
}
|
||||
// insert fragment of undeleted nodes
|
||||
dom.appendChild(fragment);
|
||||
}
|
||||
}
|
||||
/* TODO: smartscrolling
|
||||
@@ -2982,6 +2933,7 @@ function afterTransactionSelectionFixer (y, transaction, remote) {
|
||||
}
|
||||
}
|
||||
if (shouldUpdate) {
|
||||
console.info('updating selection!!');
|
||||
browserSelection.setBaseAndExtent(
|
||||
anchorNode,
|
||||
anchorOffset,
|
||||
@@ -2989,6 +2941,9 @@ function afterTransactionSelectionFixer (y, transaction, remote) {
|
||||
focusOffset
|
||||
);
|
||||
}
|
||||
// delete, so the objects can be gc'd
|
||||
relativeSelection = null;
|
||||
browserSelection = null;
|
||||
}
|
||||
|
||||
class YXmlEvent extends YEvent {
|
||||
@@ -3756,7 +3711,7 @@ function domToYXml (parent, doms, _document) {
|
||||
}
|
||||
if (parent._domFilter(d.nodeName, new Map()) !== null) {
|
||||
let type;
|
||||
const hookName = d._yjsHook || (d.dataset != null ? d.dataset.yjsHook : undefined);
|
||||
const hookName = d._yjsHook;
|
||||
if (hookName !== undefined) {
|
||||
type = new YXmlHook(hookName, d);
|
||||
} else if (d.nodeType === d.TEXT_NODE) {
|
||||
@@ -3794,7 +3749,7 @@ class YXmlTreeWalker {
|
||||
}
|
||||
}
|
||||
do {
|
||||
if (!n._deleted && (n.constructor === YXmlFragment._YXmlElement || n.constructor === YXmlFragment) && n._start !== null) {
|
||||
if (!n._deleted && n.constructor === YXmlFragment._YXmlElement && n._start !== null) {
|
||||
// walk down in the tree
|
||||
n = n._start;
|
||||
} else {
|
||||
@@ -3882,23 +3837,6 @@ class YXmlFragment extends YArray {
|
||||
}
|
||||
setDomFilter (f) {
|
||||
this._domFilter = f;
|
||||
let attributes = new Map();
|
||||
if (this.getAttributes !== undefined) {
|
||||
let attrs = this.getAttributes();
|
||||
for (let key in attrs) {
|
||||
attributes.set(key, attrs[key]);
|
||||
}
|
||||
}
|
||||
let result = this._domFilter(this.nodeName, new Map(attributes));
|
||||
if (result === null) {
|
||||
this._delete(this._y);
|
||||
} else {
|
||||
attributes.forEach((value, key) => {
|
||||
if (!result.has(key)) {
|
||||
this.removeAttribute(key);
|
||||
}
|
||||
});
|
||||
}
|
||||
this.forEach(xml => {
|
||||
xml.setDomFilter(f);
|
||||
});
|
||||
@@ -4024,7 +3962,7 @@ class YXmlFragment extends YArray {
|
||||
mutations.forEach(mutation => {
|
||||
const dom = mutation.target;
|
||||
const yxml = dom._yxml;
|
||||
if (yxml == null || yxml.constructor === YXmlHook) {
|
||||
if (yxml == null) {
|
||||
// dom element is filtered
|
||||
return
|
||||
}
|
||||
@@ -4240,7 +4178,6 @@ class YXmlHook extends YMap {
|
||||
if (hookName !== undefined) {
|
||||
this.hookName = hookName;
|
||||
this._dom = dom;
|
||||
dom._yjsHook = hookName;
|
||||
dom._yxml = this;
|
||||
getHook(hookName).fillType(dom, this);
|
||||
}
|
||||
@@ -4251,15 +4188,9 @@ class YXmlHook extends YMap {
|
||||
const dom = getHook(this.hookName).createDom(this);
|
||||
this._dom = dom;
|
||||
dom._yxml = this;
|
||||
dom._yjsHook = this.hookName;
|
||||
}
|
||||
return this._dom
|
||||
}
|
||||
_unbindFromDom () {
|
||||
this._dom._yxml = null;
|
||||
this._yxml = null;
|
||||
// TODO: cleanup hook?
|
||||
}
|
||||
_fromBinary (y, decoder) {
|
||||
const missing = super._fromBinary(y, decoder);
|
||||
this.hookName = decoder.readVarString();
|
||||
@@ -4275,12 +4206,6 @@ class YXmlHook extends YMap {
|
||||
}
|
||||
super._integrate(y);
|
||||
}
|
||||
setDomFilter () {
|
||||
// TODO: implement new modfilter method!
|
||||
}
|
||||
enableSmartScrolling () {
|
||||
// TODO: implement new smartscrolling method!
|
||||
}
|
||||
}
|
||||
YXmlHook.addHook = addHook;
|
||||
|
||||
@@ -4743,7 +4668,7 @@ var y = d * 365.25;
|
||||
* @api public
|
||||
*/
|
||||
|
||||
var index = function(val, options) {
|
||||
var ms = function(val, options) {
|
||||
options = options || {};
|
||||
var type = typeof val;
|
||||
if (type === 'string' && val.length > 0) {
|
||||
@@ -4885,7 +4810,7 @@ exports.coerce = coerce;
|
||||
exports.disable = disable;
|
||||
exports.enable = enable;
|
||||
exports.enabled = enabled;
|
||||
exports.humanize = index;
|
||||
exports.humanize = ms;
|
||||
|
||||
/**
|
||||
* The currently active debug mode names, and names to skip.
|
||||
@@ -4944,8 +4869,8 @@ function createDebug(namespace) {
|
||||
|
||||
// set `diff` timestamp
|
||||
var curr = +new Date();
|
||||
var ms = curr - (prevTime || curr);
|
||||
self.diff = ms;
|
||||
var ms$$1 = curr - (prevTime || curr);
|
||||
self.diff = ms$$1;
|
||||
self.prev = prevTime;
|
||||
self.curr = curr;
|
||||
prevTime = curr;
|
||||
@@ -4964,19 +4889,19 @@ function createDebug(namespace) {
|
||||
}
|
||||
|
||||
// apply any `formatters` transformations
|
||||
var index$$1 = 0;
|
||||
var index = 0;
|
||||
args[0] = args[0].replace(/%([a-zA-Z%])/g, function(match, format) {
|
||||
// if we encounter an escaped % then don't increase the array index
|
||||
if (match === '%%') return match;
|
||||
index$$1++;
|
||||
index++;
|
||||
var formatter = exports.formatters[format];
|
||||
if ('function' === typeof formatter) {
|
||||
var val = args[index$$1];
|
||||
var val = args[index];
|
||||
match = formatter.call(self, val);
|
||||
|
||||
// now we need to remove `args[index]` since it's inlined in the `format`
|
||||
args.splice(index$$1, 1);
|
||||
index$$1--;
|
||||
args.splice(index, 1);
|
||||
index--;
|
||||
}
|
||||
return match;
|
||||
});
|
||||
@@ -5939,7 +5864,7 @@ if (typeof Y !== 'undefined') {
|
||||
}
|
||||
|
||||
var chance_1 = createCommonjsModule(function (module, exports) {
|
||||
// Chance.js 1.0.10
|
||||
// Chance.js 1.0.12
|
||||
// http://chancejs.com
|
||||
// (c) 2013 Victor Quinn
|
||||
// Chance may be freely distributed or modified under the MIT license.
|
||||
@@ -6004,7 +5929,7 @@ var chance_1 = createCommonjsModule(function (module, exports) {
|
||||
return this;
|
||||
}
|
||||
|
||||
Chance.prototype.VERSION = "1.0.10";
|
||||
Chance.prototype.VERSION = "1.0.12";
|
||||
|
||||
// Random helper functions
|
||||
function initOptions(options, defaults) {
|
||||
@@ -6223,6 +6148,16 @@ var chance_1 = createCommonjsModule(function (module, exports) {
|
||||
return integer.toString(16);
|
||||
};
|
||||
|
||||
Chance.prototype.letter = function(options) {
|
||||
options = initOptions(options, {casing: 'lower'});
|
||||
var pool = "abcdefghijklmnopqrstuvwxyz";
|
||||
var letter = this.character({pool: pool});
|
||||
if (options.casing === 'upper') {
|
||||
letter = letter.toUpperCase();
|
||||
}
|
||||
return letter;
|
||||
};
|
||||
|
||||
/**
|
||||
* Return a random string
|
||||
*
|
||||
@@ -7165,8 +7100,25 @@ var chance_1 = createCommonjsModule(function (module, exports) {
|
||||
return this.word({length: options.length}) + '@' + (options.domain || this.domain());
|
||||
};
|
||||
|
||||
/**
|
||||
* #Description:
|
||||
* ===============================================
|
||||
* Generate a random Facebook id, aka fbid.
|
||||
*
|
||||
* NOTE: At the moment (Sep 2017), Facebook ids are
|
||||
* "numeric strings" of length 16.
|
||||
* However, Facebook Graph API documentation states that
|
||||
* "it is extremely likely to change over time".
|
||||
* @see https://developers.facebook.com/docs/graph-api/overview/
|
||||
*
|
||||
* #Examples:
|
||||
* ===============================================
|
||||
* chance.fbid() => '1000035231661304'
|
||||
*
|
||||
* @return [string] facebook id
|
||||
*/
|
||||
Chance.prototype.fbid = function () {
|
||||
return parseInt('10000' + this.natural({max: 100000000000}), 10);
|
||||
return '10000' + this.string({pool: "1234567890", length: 11});
|
||||
};
|
||||
|
||||
Chance.prototype.google_analytics = function () {
|
||||
@@ -8007,8 +7959,72 @@ var chance_1 = createCommonjsModule(function (module, exports) {
|
||||
|
||||
// -- End Regional
|
||||
|
||||
// -- Music --
|
||||
|
||||
Chance.prototype.note = function(options) {
|
||||
// choices for 'notes' option:
|
||||
// flatKey - chromatic scale with flat notes (default)
|
||||
// sharpKey - chromatic scale with sharp notes
|
||||
// flats - just flat notes
|
||||
// sharps - just sharp notes
|
||||
// naturals - just natural notes
|
||||
// all - naturals, sharps and flats
|
||||
options = initOptions(options, { notes : 'flatKey'});
|
||||
var scales = {
|
||||
naturals: ['C', 'D', 'E', 'F', 'G', 'A', 'B'],
|
||||
flats: ['D♭', 'E♭', 'G♭', 'A♭', 'B♭'],
|
||||
sharps: ['C♯', 'D♯', 'F♯', 'G♯', 'A♯']
|
||||
};
|
||||
scales.all = scales.naturals.concat(scales.flats.concat(scales.sharps));
|
||||
scales.flatKey = scales.naturals.concat(scales.flats);
|
||||
scales.sharpKey = scales.naturals.concat(scales.sharps);
|
||||
return this.pickone(scales[options.notes]);
|
||||
};
|
||||
|
||||
Chance.prototype.midi_note = function(options) {
|
||||
var min = 0;
|
||||
var max = 127;
|
||||
options = initOptions(options, { min : min, max : max });
|
||||
return this.integer({min: options.min, max: options.max});
|
||||
};
|
||||
|
||||
Chance.prototype.chord_quality = function(options) {
|
||||
options = initOptions(options, { jazz: true });
|
||||
var chord_qualities = ['maj', 'min', 'aug', 'dim'];
|
||||
if (options.jazz){
|
||||
chord_qualities = [
|
||||
'maj7',
|
||||
'min7',
|
||||
'7',
|
||||
'sus',
|
||||
'dim',
|
||||
'ø'
|
||||
];
|
||||
}
|
||||
return this.pickone(chord_qualities);
|
||||
};
|
||||
|
||||
Chance.prototype.chord = function (options) {
|
||||
options = initOptions(options);
|
||||
return this.note(options) + this.chord_quality(options);
|
||||
};
|
||||
|
||||
Chance.prototype.tempo = function (options) {
|
||||
var min = 40;
|
||||
var max = 320;
|
||||
options = initOptions(options, {min: min, max: max});
|
||||
return this.integer({min: options.min, max: options.max});
|
||||
};
|
||||
|
||||
// -- End Music
|
||||
|
||||
// -- Miscellaneous --
|
||||
|
||||
// Coin - Flip, flip, flipadelphia
|
||||
Chance.prototype.coin = function(options) {
|
||||
return this.bool() ? "heads" : "tails";
|
||||
};
|
||||
|
||||
// Dice - For all the board game geeks out there, myself included ;)
|
||||
function diceFn (range) {
|
||||
return function () {
|
||||
@@ -13489,7 +13505,7 @@ async function applyRandomTests (t, mods, iterations) {
|
||||
return initInformation
|
||||
}
|
||||
|
||||
var index$1$1 = function (str) {
|
||||
var index$1 = function (str) {
|
||||
return encodeURIComponent(str).replace(/[!'()*]/g, function (c) {
|
||||
return '%' + c.charCodeAt(0).toString(16).toUpperCase();
|
||||
});
|
||||
@@ -13675,7 +13691,7 @@ function parserForArrayFormat(opts) {
|
||||
|
||||
function encode(value, opts) {
|
||||
if (opts.encode) {
|
||||
return opts.strict ? index$1$1(value) : encodeURIComponent(value);
|
||||
return opts.strict ? index$1(value) : encodeURIComponent(value);
|
||||
}
|
||||
|
||||
return value;
|
||||
@@ -13787,7 +13803,7 @@ var stringify = function (obj, opts) {
|
||||
}).join('&') : '';
|
||||
};
|
||||
|
||||
var index$2 = {
|
||||
var index = {
|
||||
extract: extract,
|
||||
parse: parse$1,
|
||||
stringify: stringify
|
||||
@@ -13802,7 +13818,7 @@ const browserSupport =
|
||||
|
||||
function createTestLink (params) {
|
||||
if (typeof location !== 'undefined') {
|
||||
var query = index$2.parse(location.search);
|
||||
var query = index.parse(location.search);
|
||||
delete query.test;
|
||||
delete query.seed;
|
||||
delete query.args;
|
||||
@@ -13812,7 +13828,7 @@ function createTestLink (params) {
|
||||
query[name] = params[name];
|
||||
}
|
||||
}
|
||||
return location.protocol + '//' + location.host + location.pathname + '?' + index$2.stringify(query) + location.hash
|
||||
return location.protocol + '//' + location.host + location.pathname + '?' + index.stringify(query) + location.hash
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13823,7 +13839,7 @@ class TestHandler {
|
||||
this.repeatingRun = 0;
|
||||
this.tests = {};
|
||||
if (typeof location !== 'undefined') {
|
||||
this.opts = index$2.parse(location.search);
|
||||
this.opts = index.parse(location.search);
|
||||
if (this.opts.case != null) {
|
||||
this.opts.case = Number(this.opts.case);
|
||||
}
|
||||
@@ -13964,7 +13980,7 @@ function createCommonjsModule$1(fn, module) {
|
||||
return module = { exports: {} }, fn(module, module.exports), module.exports;
|
||||
}
|
||||
|
||||
var isBrowser = typeof index$2 !== 'undefined';
|
||||
var isBrowser = typeof index !== 'undefined';
|
||||
|
||||
var environment = {
|
||||
isBrowser: isBrowser
|
||||
@@ -18513,8 +18529,8 @@ var stacktraceGps = createCommonjsModule$1(function (module, exports) {
|
||||
* @returns {String} original representation of the base64-encoded string.
|
||||
*/
|
||||
function _atob(b64str) {
|
||||
if (typeof index$2 !== 'undefined' && index$2.atob) {
|
||||
return index$2.atob(b64str);
|
||||
if (typeof index !== 'undefined' && index.atob) {
|
||||
return index.atob(b64str);
|
||||
} else {
|
||||
throw new Error('You must supply a polyfill for window.atob in this environment');
|
||||
}
|
||||
@@ -19024,7 +19040,7 @@ var stacktrace = createCommonjsModule$1(function (module, exports) {
|
||||
}));
|
||||
});
|
||||
|
||||
index$2.stacktrace = stacktrace;
|
||||
index.stacktrace = stacktrace;
|
||||
|
||||
function test (testDescription, ...args) {
|
||||
let location = stacktrace.getSync()[1];
|
||||
@@ -19312,6 +19328,7 @@ test('deep element insert', async function xml16 (t) {
|
||||
deepElement.append(boldElement);
|
||||
deepElement.append(attrElement);
|
||||
dom0.append(deepElement);
|
||||
console.log(dom0.outerHTML);
|
||||
let str0 = dom0.outerHTML;
|
||||
await flushAll(t, users);
|
||||
let str1 = dom1.outerHTML;
|
||||
@@ -19371,6 +19388,7 @@ test('Filtering remote changes', async function xmlFilteringRemote (t) {
|
||||
// check dom
|
||||
paragraph.getDom().setAttribute('malicious', 'true');
|
||||
span.getDom().setAttribute('malicious', 'true');
|
||||
console.log(xml0.toString());
|
||||
// check incoming attributes
|
||||
xml1.get(0).get(0).setAttribute('malicious', 'true');
|
||||
xml1.insert(0, [new Y$1.XmlElement('hideMe')]);
|
||||
@@ -19481,5 +19499,7 @@ test('y-xml: Random tests (1000)', async function xmlRandom1000 (t) {
|
||||
await applyRandomTests(t, xmlTransactions, 1000);
|
||||
});
|
||||
|
||||
Object.defineProperty(exports, '__esModule', { value: true });
|
||||
|
||||
})));
|
||||
//# sourceMappingURL=y.test.js.map
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user