')),
this.$body.append(this.$elm),
(i = function (o, t) {
t.elm.remove();
@@ -48,24 +48,24 @@
if (o.modal.isActive()) {
t.trigger(o.modal.AJAX_SUCCESS);
var s = l();
- s.$elm.empty().append(e).on(o.modal.CLOSE, i),
+ (s.$elm.empty().append(e).on(o.modal.CLOSE, i),
s.hideSpinner(),
s.open(),
- t.trigger(o.modal.AJAX_COMPLETE);
+ t.trigger(o.modal.AJAX_COMPLETE));
}
})
.fail(function () {
t.trigger(o.modal.AJAX_FAIL);
var e = l();
- e.hideSpinner(), s.pop(), t.trigger(o.modal.AJAX_COMPLETE);
- });
- else (this.$elm = t), this.$body.append(this.$elm), this.open();
+ (e.hideSpinner(), s.pop(), t.trigger(o.modal.AJAX_COMPLETE));
+ }));
+ else ((this.$elm = t), this.$body.append(this.$elm), this.open());
}),
(o.modal.prototype = {
constructor: o.modal,
open: function () {
var t = this;
- this.block(),
+ (this.block(),
this.options.doFade
? setTimeout(function () {
t.show();
@@ -80,16 +80,16 @@
this.options.clickClose &&
this.$blocker.click(function (t) {
t.target == this && o.modal.close();
- });
+ }));
},
close: function () {
- s.pop(),
+ (s.pop(),
this.unblock(),
this.hide(),
- o.modal.isActive() || o(e).off('keydown.modal');
+ o.modal.isActive() || o(e).off('keydown.modal'));
},
block: function () {
- this.$elm.trigger(o.modal.BEFORE_BLOCK, [this._ctx()]),
+ (this.$elm.trigger(o.modal.BEFORE_BLOCK, [this._ctx()]),
this.$body.css('overflow', 'hidden'),
(this.$blocker = o(
'
c.size &&
((d = a
.trim(b)
@@ -27,7 +27,7 @@
.slice(0, -1)
.join(' ')),
c.ignore && (d = d.replace(f, '')),
- a(this).html(d + c.omission));
+ a(this).html(d + c.omission)));
});
};
g();
diff --git a/src/baseframe/static/js/jquery.truncate8.js b/src/baseframe/static/js/jquery.truncate8.js
index 1c507421..d8321287 100644
--- a/src/baseframe/static/js/jquery.truncate8.js
+++ b/src/baseframe/static/js/jquery.truncate8.js
@@ -9,9 +9,9 @@
*/
!(function (t) {
function e(e) {
- (this.$element = t(e)),
+ ((this.$element = t(e)),
(this.original_text = this.$element.html().trim()),
- (this.settings = t.extend({}, t.fn.trunk8.defaults));
+ (this.settings = t.extend({}, t.fn.trunk8.defaults)));
}
function n(t) {
var e = document.createElement('DIV');
@@ -32,12 +32,12 @@
o && e !== s.lastIndex;
)
- (e = s.lastIndex),
+ ((e = s.lastIndex),
o[5]
? a.push(o[5])
: o[1] &&
a.push({ tag: o[1], attribs: o[2], content: o[3], after: o[4] }),
- (o = s.exec(t));
+ (o = s.exec(t)));
for (i = 0; i < a.length; i++)
'string' != typeof a[i] &&
a[i].content &&
@@ -53,7 +53,7 @@
h,
u = '';
for (h = 0; h < n.length; h++)
- (s = n[h]),
+ ((s = n[h]),
(l = t.trim(e).split(' ').length),
t.trim(e).length &&
('string' == typeof s
@@ -77,11 +77,11 @@
'' +
- s.after))));
+ s.after)))));
return u;
},
a = i(n);
- return a.slice(a.length - r.length) === r && (a += r), a;
+ return (a.slice(a.length - r.length) === r && (a += r), a);
}
function a() {
var e,
@@ -108,20 +108,20 @@
) {
if (this.height() <= y) return;
for (e = 0, a = x - 1; a >= e; )
- (s = e + ((a - e) >> 1)),
+ ((s = e + ((a - e) >> 1)),
(l = o.eatStr(S, d, x - s, m)),
v && c && (l = i(l, c, m)),
this.html(l),
this.height() > y
? (a = s - 1)
- : ((e = s + 1), (b = b.length > l.length ? b : l));
- this.html(''), this.html(b), g.tooltip && this.attr('title', u);
+ : ((e = s + 1), (b = b.length > l.length ? b : l)));
+ (this.html(''), this.html(b), g.tooltip && this.attr('title', u));
} else {
if (isNaN(p)) return void t.error('Invalid width "' + p + '".');
- (s = x - p),
+ ((s = x - p),
(l = o.eatStr(S, d, s, m)),
this.html(l),
- g.tooltip && this.attr('title', S);
+ g.tooltip && this.attr('title', S));
}
g.onTruncate();
}
@@ -129,7 +129,7 @@
o,
l = { center: 'center', left: 'left', right: 'right' },
h = { auto: 'auto' };
- (e.prototype.updateSettings = function (e) {
+ ((e.prototype.updateSettings = function (e) {
this.settings = t.extend(this.settings, e);
}),
(s = {
@@ -137,15 +137,15 @@
return this.each(function () {
var r = t(this),
i = r.data('trunk8');
- i || r.data('trunk8', (i = new e(this))),
+ (i || r.data('trunk8', (i = new e(this))),
i.updateSettings(n),
- a.call(r);
+ a.call(r));
});
},
update: function (e) {
return this.each(function () {
var n = t(this);
- e && (n.data('trunk8').original_text = e), a.call(n);
+ (e && (n.data('trunk8').original_text = e), a.call(n));
});
},
revert: function () {
@@ -231,5 +231,5 @@
width: h.auto,
parseHTML: !1,
onTruncate: function () {},
- });
+ }));
})(jQuery);
diff --git a/src/baseframe/static/js/jquery.ui.touch-punch.js b/src/baseframe/static/js/jquery.ui.touch-punch.js
index 8b5d5cf4..eae8e821 100644
--- a/src/baseframe/static/js/jquery.ui.touch-punch.js
+++ b/src/baseframe/static/js/jquery.ui.touch-punch.js
@@ -14,7 +14,7 @@
a.preventDefault();
var c = a.originalEvent.changedTouches[0],
d = document.createEvent('MouseEvents');
- d.initMouseEvent(
+ (d.initMouseEvent(
b,
!0,
!0,
@@ -31,7 +31,7 @@
0,
null
),
- a.target.dispatchEvent(d);
+ a.target.dispatchEvent(d));
}
}
if (((a.support.touch = 'ontouchend' in document), a.support.touch)) {
@@ -39,7 +39,7 @@
b = a.ui.mouse.prototype,
c = b._mouseInit,
d = b._mouseDestroy;
- (b._touchStart = function (a) {
+ ((b._touchStart = function (a) {
var b = this;
!e &&
b._mouseCapture(a.originalEvent.changedTouches[0]) &&
@@ -61,21 +61,21 @@
}),
(b._mouseInit = function () {
var b = this;
- b.element.bind({
+ (b.element.bind({
touchstart: a.proxy(b, '_touchStart'),
touchmove: a.proxy(b, '_touchMove'),
touchend: a.proxy(b, '_touchEnd'),
}),
- c.call(b);
+ c.call(b));
}),
(b._mouseDestroy = function () {
var b = this;
- b.element.unbind({
+ (b.element.unbind({
touchstart: a.proxy(b, '_touchStart'),
touchmove: a.proxy(b, '_touchMove'),
touchend: a.proxy(b, '_touchEnd'),
}),
- d.call(b);
- });
+ d.call(b));
+ }));
}
})(jQuery);
diff --git a/src/baseframe/static/js/jquery_jeditable.js b/src/baseframe/static/js/jquery_jeditable.js
index fd07e0ee..cfcc4d77 100644
--- a/src/baseframe/static/js/jquery_jeditable.js
+++ b/src/baseframe/static/js/jquery_jeditable.js
@@ -2,8 +2,8 @@
!(function ($) {
'use strict';
- ($.fn.editableAriaShim = function () {
- return this.attr({ role: 'button', tabindex: 0 }), this;
+ (($.fn.editableAriaShim = function () {
+ return (this.attr({ role: 'button', tabindex: 0 }), this);
}),
($.fn.editable = function (target, options) {
if ('disable' !== target)
@@ -47,7 +47,7 @@
settings.tooltip && $(this).attr('title', settings.tooltip),
this.each(function () {
var self = this;
- $(this).data('event.editable', settings.event),
+ ($(this).data('event.editable', settings.event),
$.trim($(this).html()) || $(this).html(settings.placeholder),
'destroy' !== target
? ($(this).on(settings.event, function (e) {
@@ -67,7 +67,7 @@
!jQuery.isFunction(settings.before)
)
throw "The 'before' option needs to be provided as a function!";
- e.preventDefault(),
+ (e.preventDefault(),
e.stopPropagation(),
settings.tooltip && $(self).removeAttr('title'),
$(this)
@@ -79,9 +79,9 @@
.replace(/(;|"|\/)/g, '') && $(this).html(''),
(self.editing = !0),
(self.revert = $(self).text()),
- $(self).html('');
+ $(self).html(''));
var form = $('
');
- settings.cssclass &&
+ (settings.cssclass &&
('inherit' === settings.cssclass
? form.attr('class', $(self).attr('class'))
: form.attr('class', settings.cssclass)),
@@ -94,7 +94,8 @@
form.append(
'
'
),
- settings.formid && form.attr('id', settings.formid);
+ settings.formid &&
+ form.attr('id', settings.formid));
var input_content,
t,
input = element.apply(form, [settings, self]);
@@ -104,12 +105,12 @@
: input.attr('class', settings.inputcssclass));
var isSubmitting = !1;
if (settings.loadurl) {
- (t = self.setTimeout(function () {
+ ((t = self.setTimeout(function () {
input.disabled = !0;
}, 100)),
- $(self).html(settings.loadtext);
+ $(self).html(settings.loadtext));
var loaddata = {};
- (loaddata[settings.id] = self.id),
+ ((loaddata[settings.id] = self.id),
$.isFunction(settings.loaddata)
? $.extend(
loaddata,
@@ -126,11 +127,11 @@
async: !1,
cache: !1,
success: function (result) {
- self.clearTimeout(t),
+ (self.clearTimeout(t),
(input_content = result),
- (input.disabled = !1);
+ (input.disabled = !1));
},
- });
+ }));
} else
settings.data
? ((input_content = settings.data),
@@ -154,7 +155,7 @@
(input.outerWidth(!0) - settings.width);
input.width(adj_width);
}
- buttons.apply(form, [settings, self]),
+ (buttons.apply(form, [settings, self]),
settings.showfn &&
$.isFunction(settings.showfn) &&
form.hide(),
@@ -216,7 +217,7 @@
value,
complete
) {
- (isSubmitting = !1),
+ ((isSubmitting = !1),
!1 !== complete &&
($(self).html(value),
(self.editing = !1),
@@ -225,7 +226,9 @@
settings,
]),
$.trim($(self).html()) ||
- $(self).html(settings.placeholder));
+ $(self).html(
+ settings.placeholder
+ )));
},
userTarget = settings.target.apply(self, [
input.val(),
@@ -237,7 +240,7 @@
responseHandler(userTarget, userTarget);
} else {
var submitdata = {};
- (submitdata[settings.name] = input.val()),
+ ((submitdata[settings.name] = input.val()),
(submitdata[settings.id] = self.id),
$.isFunction(settings.submitdata)
? $.extend(
@@ -254,7 +257,7 @@
),
'PUT' === settings.method &&
(submitdata._method = 'put'),
- $(self).html(settings.indicator);
+ $(self).html(settings.indicator));
var ajaxoptions = {
type: 'POST',
complete: function (xhr, status) {
@@ -264,7 +267,7 @@
dataType: 'html',
url: settings.target,
success: function (result, status) {
- (result = intercept.apply(self, [
+ ((result = intercept.apply(self, [
result,
status,
])),
@@ -277,7 +280,7 @@
submitdata,
]),
$.trim($(self).html()) ||
- $(self).html(settings.placeholder);
+ $(self).html(settings.placeholder));
},
error: function (xhr, status, error) {
onerror.apply(form, [
@@ -287,13 +290,14 @@
]);
},
};
- $.extend(ajaxoptions, settings.ajaxoptions),
- $.ajax(ajaxoptions);
+ ($.extend(ajaxoptions, settings.ajaxoptions),
+ $.ajax(ajaxoptions));
}
return (
- $(self).attr('title', settings.tooltip), !1
+ $(self).attr('title', settings.tooltip),
+ !1
);
- });
+ }));
}
}),
(self.reset = function (form) {
@@ -307,12 +311,12 @@
$(self).attr('title', settings.tooltip));
}),
(self.destroy = function (form) {
- $(self)
+ ($(self)
.off($(self).data('event.editable'))
.removeData('disabled.editable')
.removeData('event.editable'),
self.clearTimeouts(),
- self.editing && reset.apply(form, [settings, self]);
+ self.editing && reset.apply(form, [settings, self]));
}),
(self.clearTimeout = function (t) {
var timeouts = $(self).data('timeouts');
@@ -333,13 +337,14 @@
if (timeouts) {
for (var i = 0, n = timeouts.length; i < n; ++i)
clearTimeout(timeouts[i]);
- (timeouts.length = 0), $(self).removeData('timeouts');
+ ((timeouts.length = 0),
+ $(self).removeData('timeouts'));
}
}),
(self.setTimeout = function (callback, time) {
var timeouts = $(self).data('timeouts'),
t = setTimeout(function () {
- callback(), self.clearTimeout(t);
+ (callback(), self.clearTimeout(t));
}, time);
return (
timeouts ||
@@ -349,7 +354,7 @@
t
);
}))
- : destroy.apply($(this).find('form'), [settings, self]);
+ : destroy.apply($(this).find('form'), [settings, self]));
})
);
}
@@ -359,17 +364,17 @@
.removeData('event.editable');
} else $(this).data('disabled.editable', !1);
else $(this).data('disabled.editable', !0);
- });
+ }));
var _supportInType = function (type) {
var i = document.createElement('input');
- return i.setAttribute('type', type), 'text' !== i.type ? type : 'text';
+ return (i.setAttribute('type', type), 'text' !== i.type ? type : 'text');
};
- ($.editable = {
+ (($.editable = {
types: {
defaults: {
element: function (settings, original) {
var input = $('
');
- return $(this).append(input), input;
+ return ($(this).append(input), input);
},
content: function (string, settings, original) {
$(this).find(':input:first').val(string);
@@ -465,11 +470,11 @@
option,
tuples = [];
if (Array.isArray(json) && json.every(Array.isArray))
- (tuples = json),
+ ((tuples = json),
(json = {}),
tuples.forEach(function (e) {
json[e[0]] = e[1];
- });
+ }));
else for (key in json) tuples.push([key, json[key]]);
settings.sortselectoptions &&
tuples.sort(function (a, b) {
@@ -565,5 +570,5 @@
loaddata: {},
submitdata: {},
ajaxoptions: {},
- });
+ }));
})(jQuery);
diff --git a/src/baseframe/static/js/leaflet-search.js b/src/baseframe/static/js/leaflet-search.js
index d67eeb83..bb7e3bec 100644
--- a/src/baseframe/static/js/leaflet-search.js
+++ b/src/baseframe/static/js/leaflet-search.js
@@ -80,7 +80,7 @@
return '[object Object]' === Object.prototype.toString.call(a);
},
initialize: function (b) {
- a.Util.setOptions(this, b || {}),
+ (a.Util.setOptions(this, b || {}),
(this._inputMinSize = this.options.textPlaceholder
? this.options.textPlaceholder.length
: 10),
@@ -94,7 +94,7 @@
(this._autoTypeTmp = this.options.autoType),
(this._countertips = 0),
(this._recordsCache = {}),
- (this._curReq = null);
+ (this._curReq = null));
},
onAdd: function (b) {
return (
@@ -145,7 +145,7 @@
this._recordsCache = {};
},
setLayer: function (a) {
- return (this._layer = a), this._layer.addTo(this._map), this;
+ return ((this._layer = a), this._layer.addTo(this._map), this);
},
showAlert: function (a) {
var b = this;
@@ -161,7 +161,7 @@
);
},
hideAlert: function () {
- return (this._alert.style.display = 'none'), this;
+ return ((this._alert.style.display = 'none'), this);
},
cancel: function () {
return (
@@ -215,7 +215,7 @@
: this;
},
collapseDelayedStop: function () {
- return clearTimeout(this.timerCollapse), this;
+ return (clearTimeout(this.timerCollapse), this);
},
_createAlert: function (b) {
var c = a.DomUtil.create('div', b, this._container);
@@ -308,7 +308,7 @@
d,
'mousewheel',
function (b) {
- c.collapseDelayedStop(), a.DomEvent.stopPropagation(b);
+ (c.collapseDelayedStop(), a.DomEvent.stopPropagation(b));
},
this
)
@@ -330,9 +330,9 @@
((d = this.options.buildTip.call(this, b, c)), 'string' == typeof d)
) {
var e = a.DomUtil.create('div');
- (e.innerHTML = d), (d = e.firstChild);
+ ((e.innerHTML = d), (d = e.firstChild));
}
- } else (d = a.DomUtil.create('li', '')), (d.innerHTML = b);
+ } else ((d = a.DomUtil.create('li', '')), (d.innerHTML = b));
return (
a.DomUtil.addClass(d, 'search-tip'),
(d._text = b),
@@ -343,11 +343,11 @@
d,
'click',
function (a) {
- (this._input.value = b),
+ ((this._input.value = b),
this._handleAutoresize(),
this._input.focus(),
this._hideTooltip(),
- this._handleSubmit();
+ this._handleSubmit());
},
this
),
@@ -365,9 +365,9 @@
e,
f = {};
if (((a = a.replace(/[.*+?^${}()|[\]\\]/g, '')), '' === a)) return [];
- (c = this.options.initial ? '^' : ''),
+ ((c = this.options.initial ? '^' : ''),
(d = this.options.casesensitive ? void 0 : 'i'),
- (e = new RegExp(c + a, d));
+ (e = new RegExp(c + a, d)));
for (var g in b) e.test(g) && (f[g] = b[g]);
return f;
},
@@ -380,8 +380,8 @@
)
for (var b in a) {
if (this._countertips === this.options.tooltipLimit) break;
- this._countertips++,
- this._tooltip.appendChild(this._createTip(b, a[b]));
+ (this._countertips++,
+ this._tooltip.appendChild(this._createTip(b, a[b])));
}
return (
this._countertips > 0
@@ -527,10 +527,10 @@
this._input.createTextRange)
) {
var d = this._input.createTextRange();
- d.collapse(!0),
+ (d.collapse(!0),
d.moveStart('character', a),
d.moveEnd('character', c),
- d.select();
+ d.select());
} else
this._input.setSelectionRange
? this._input.setSelectionRange(a, c)
@@ -542,13 +542,13 @@
var a;
if ((a = this._input.selection) && a.empty) a.empty();
else if (this._input.createTextRange) {
- (a = this._input.createTextRange()), a.collapse(!0);
+ ((a = this._input.createTextRange()), a.collapse(!0));
var b = this._input.value.length;
- a.moveStart('character', b), a.moveEnd('character', b), a.select();
+ (a.moveStart('character', b), a.moveEnd('character', b), a.select());
} else
- this._input.getSelection &&
+ (this._input.getSelection &&
this._input.getSelection().removeAllRanges(),
- (this._input.selectionStart = this._input.selectionEnd);
+ (this._input.selectionStart = this._input.selectionEnd));
},
_handleKeypress: function (a) {
var b = this;
@@ -557,11 +557,11 @@
this.collapse();
break;
case 13:
- (1 == this._countertips ||
+ ((1 == this._countertips ||
(this.options.firstTipSubmit && this._countertips > 0)) &&
-1 == this._tooltip.currentSelection &&
this._handleArrowSelect(1),
- this._handleSubmit();
+ this._handleSubmit());
break;
case 38:
this._handleArrowSelect(-1);
@@ -582,7 +582,7 @@
case 36:
break;
default:
- this._input.value.length
+ (this._input.value.length
? (this._cancel.style.display = 'block')
: (this._cancel.style.display = 'none'),
this._input.value.length >= this.options.minLength
@@ -590,23 +590,23 @@
(this.timerKeypress = setTimeout(function () {
b._fillRecordsCache();
}, this.options.delayType)))
- : this._hideTooltip();
+ : this._hideTooltip());
}
this._handleAutoresize();
},
searchText: function (b) {
var c = b.charCodeAt(b.length);
- (this._input.value = b),
+ ((this._input.value = b),
(this._input.style.display = 'block'),
a.DomUtil.addClass(this._container, 'search-exp'),
(this._autoTypeTmp = !1),
- this._handleKeypress({ keyCode: c });
+ this._handleKeypress({ keyCode: c }));
},
_fillRecordsCache: function () {
var b,
c = this,
d = this._input.value;
- this._curReq && this._curReq.abort && this._curReq.abort(),
+ (this._curReq && this._curReq.abort && this._curReq.abort(),
a.DomUtil.addClass(this._container, 'search-load'),
this.options.layer
? ((this._recordsCache = this._recordsFromLayer()),
@@ -620,17 +620,17 @@
? this._recordsFromJsonp
: this._recordsFromAjax),
(this._curReq = this._retrieveData.call(this, d, function (d) {
- (c._recordsCache = c._formatData.call(c, d)),
+ ((c._recordsCache = c._formatData.call(c, d)),
(b = c.options.sourceData
? c._filterData(c._input.value, c._recordsCache)
: c._recordsCache),
c.showTooltip(b),
- a.DomUtil.removeClass(c._container, 'search-load');
- })));
+ a.DomUtil.removeClass(c._container, 'search-load'));
+ }))));
},
_handleAutoresize: function () {
var a;
- this._input.style.maxWidth !== this._map._container.offsetWidth &&
+ (this._input.style.maxWidth !== this._map._container.offsetWidth &&
((a = this._map._container.clientWidth),
(a -= 83),
(this._input.style.maxWidth = a.toString() + 'px')),
@@ -640,7 +640,7 @@
(this._input.size =
this._input.value.length < this._inputMinSize
? this._inputMinSize
- : this._input.value.length);
+ : this._input.value.length));
},
_handleArrowSelect: function (b) {
var c = this._tooltip.hasChildNodes() ? this._tooltip.childNodes : [];
@@ -654,12 +654,12 @@
else if (-1 == b && this._tooltip.currentSelection <= 0)
this._tooltip.currentSelection = -1;
else if ('none' != this._tooltip.style.display) {
- (this._tooltip.currentSelection += b),
+ ((this._tooltip.currentSelection += b),
a.DomUtil.addClass(
c[this._tooltip.currentSelection],
'search-tip-select'
),
- (this._input.value = c[this._tooltip.currentSelection]._text);
+ (this._input.value = c[this._tooltip.currentSelection]._text));
var d = c[this._tooltip.currentSelection].offsetTop;
d + c[this._tooltip.currentSelection].clientHeight >=
this._tooltip.scrollTop + this._tooltip.clientHeight
@@ -721,21 +721,21 @@
circle: { radius: 10, weight: 3, color: '#e03', stroke: !0, fill: !1 },
},
initialize: function (b, c) {
- a.setOptions(this, c),
+ (a.setOptions(this, c),
c.icon === !0 && (c.icon = new a.Icon.Default()),
a.Marker.prototype.initialize.call(this, b, c),
a.Control.Search.prototype._isObject(this.options.circle) &&
- (this._circleLoc = new a.CircleMarker(b, this.options.circle));
+ (this._circleLoc = new a.CircleMarker(b, this.options.circle)));
},
onAdd: function (b) {
- a.Marker.prototype.onAdd.call(this, b),
+ (a.Marker.prototype.onAdd.call(this, b),
this._circleLoc &&
(b.addLayer(this._circleLoc),
- this.options.animate && this.animate());
+ this.options.animate && this.animate()));
},
onRemove: function (b) {
- a.Marker.prototype.onRemove.call(this, b),
- this._circleLoc && b.removeLayer(this._circleLoc);
+ (a.Marker.prototype.onRemove.call(this, b),
+ this._circleLoc && b.removeLayer(this._circleLoc));
},
setLatLng: function (b) {
return (
@@ -760,11 +760,11 @@
f = 2 * a._radius,
g = 0;
a._timerAnimLoc = setInterval(function () {
- (g += 0.5),
+ ((g += 0.5),
(d += g),
(f -= d),
a.setRadius(f),
- e > f && (clearInterval(a._timerAnimLoc), a.setRadius(e));
+ e > f && (clearInterval(a._timerAnimLoc), a.setRadius(e)));
}, b);
}
return this;
diff --git a/src/baseframe/static/js/leaflet.js b/src/baseframe/static/js/leaflet.js
index e759f4f6..8c6383cc 100644
--- a/src/baseframe/static/js/leaflet.js
+++ b/src/baseframe/static/js/leaflet.js
@@ -27,13 +27,13 @@
};
}
function n(t) {
- return (t._leaflet_id = t._leaflet_id || ++ei), t._leaflet_id;
+ return ((t._leaflet_id = t._leaflet_id || ++ei), t._leaflet_id);
}
function o(t, i, e) {
var n, o, s, r;
return (
(r = function () {
- (n = !1), o && (s.apply(e, o), (o = !1));
+ ((n = !1), o && (s.apply(e, o), (o = !1)));
}),
(s = function () {
n
@@ -80,7 +80,7 @@
return t.replace(ni, function (t, e) {
var n = i[e];
if (void 0 === n) throw new Error('No value provided for variable ' + t);
- return 'function' == typeof n && (n = n(i)), n;
+ return ('function' == typeof n && (n = n(i)), n);
});
}
function d(t, i) {
@@ -93,7 +93,7 @@
function m(t) {
var i = +new Date(),
e = Math.max(0, 16 - (i - ri));
- return (ri = i + e), window.setTimeout(t, e);
+ return ((ri = i + e), window.setTimeout(t, e));
}
function f(t, i, n) {
if (!n || ai !== m) return ai.call(window, e(t, i));
@@ -115,7 +115,7 @@
}
}
function x(t, i, e) {
- (this.x = e ? Math.round(t) : t), (this.y = e ? Math.round(i) : i);
+ ((this.x = e ? Math.round(t) : t), (this.y = e ? Math.round(i) : i));
}
function w(t, i, e) {
return t instanceof x
@@ -147,7 +147,7 @@
function M(t, i, e) {
if (isNaN(t) || isNaN(i))
throw new Error('Invalid LatLng object: (' + t + ', ' + i + ')');
- (this.lat = +t), (this.lng = +i), void 0 !== e && (this.alt = +e);
+ ((this.lat = +t), (this.lng = +i), void 0 !== e && (this.alt = +e));
}
function C(t, i, e) {
return t instanceof M
@@ -174,7 +174,7 @@
(this._c = t[2]),
void (this._d = t[3])
);
- (this._a = t), (this._b = i), (this._c = e), (this._d = n);
+ ((this._a = t), (this._b = i), (this._c = e), (this._d = n));
}
function Z(t, i, e, n) {
return new S(t, i, e, n);
@@ -192,7 +192,7 @@
h = '';
for (e = 0, o = t.length; e < o; e++) {
for (n = 0, s = (r = t[e]).length; n < s; n++)
- (a = r[n]), (h += (n ? 'L' : 'M') + a.x + ' ' + a.y);
+ ((a = r[n]), (h += (n ? 'L' : 'M') + a.x + ' ' + a.y));
h += i ? (Ji ? 'z' : 'x') : '';
}
return h || 'M0 0';
@@ -235,28 +235,28 @@
}
j(t, i);
});
- (t['_leaflet_touchstart' + n] = o),
+ ((t['_leaflet_touchstart' + n] = o),
t.addEventListener(te, o, !1),
re ||
(document.documentElement.addEventListener(te, R, !0),
document.documentElement.addEventListener(ie, N, !0),
document.documentElement.addEventListener(ee, D, !0),
document.documentElement.addEventListener(ne, D, !0),
- (re = !0));
+ (re = !0)));
}
function R(t) {
- (se[t.pointerId] = t), ae++;
+ ((se[t.pointerId] = t), ae++);
}
function N(t) {
se[t.pointerId] && (se[t.pointerId] = t);
}
function D(t) {
- delete se[t.pointerId], ae--;
+ (delete se[t.pointerId], ae--);
}
function j(t, i) {
t.touches = [];
for (var e in se) t.touches.push(se[e]);
- (t.changedTouches = [t]), i(t);
+ ((t.changedTouches = [t]), i(t));
}
function W(t, i, e) {
var n = function (t) {
@@ -265,15 +265,15 @@
0 !== t.buttons) &&
j(t, i);
};
- (t['_leaflet_touchmove' + e] = n), t.addEventListener(ie, n, !1);
+ ((t['_leaflet_touchmove' + e] = n), t.addEventListener(ie, n, !1));
}
function H(t, i, e) {
var n = function (t) {
j(t, i);
};
- (t['_leaflet_touchend' + e] = n),
+ ((t['_leaflet_touchend' + e] = n),
t.addEventListener(ee, n, !1),
- t.addEventListener(ne, n, !1);
+ t.addEventListener(ne, n, !1));
}
function F(t, i, e) {
function n(t) {
@@ -285,7 +285,7 @@
if (!(i > 1)) {
var e = Date.now(),
n = e - (s || e);
- (r = t.touches ? t.touches[0] : t), (a = n > 0 && n <= h), (s = e);
+ ((r = t.touches ? t.touches[0] : t), (a = n > 0 && n <= h), (s = e));
}
}
function o(t) {
@@ -295,10 +295,10 @@
var e,
n,
o = {};
- for (n in r) (e = r[n]), (o[n] = e && e.bind ? e.bind(r) : e);
+ for (n in r) ((e = r[n]), (o[n] = e && e.bind ? e.bind(r) : e));
r = o;
}
- (r.type = 'dblclick'), i(r), (s = null);
+ ((r.type = 'dblclick'), i(r), (s = null));
}
}
var s,
@@ -339,7 +339,7 @@
}
function G(t, i, e) {
var n = document.createElement(t);
- return (n.className = i || ''), e && e.appendChild(n), n;
+ return ((n.className = i || ''), e && e.appendChild(n), n);
}
function K(t) {
var i = t.parentNode;
@@ -395,10 +395,10 @@
} catch (t) {
if (1 === i) return;
}
- (i = Math.round(100 * i)),
+ ((i = Math.round(100 * i)),
e
? ((e.Enabled = 100 !== i), (e.Opacity = i))
- : (t.style.filter += ' progid:' + n + '(opacity=' + i + ')');
+ : (t.style.filter += ' progid:' + n + '(opacity=' + i + ')'));
}
function st(t) {
for (var i = document.documentElement.style, e = 0; e < t.length; e++)
@@ -414,8 +414,10 @@
(e ? ' scale(' + e + ')' : '');
}
function at(t, i) {
- (t._leaflet_pos = i),
- ji ? rt(t, i) : ((t.style.left = i.x + 'px'), (t.style.top = i.y + 'px'));
+ ((t._leaflet_pos = i),
+ ji
+ ? rt(t, i)
+ : ((t.style.left = i.x + 'px'), (t.style.top = i.y + 'px')));
}
function ht(t) {
return t._leaflet_pos || new x(0, 0);
@@ -478,7 +480,7 @@
return e.call(o || t, i || window.event);
},
a = r;
- Vi && 0 === i.indexOf('touch')
+ (Vi && 0 === i.indexOf('touch')
? B(t, i, r, s)
: !qi || 'dblclick' !== i || !F || (Vi && Ei)
? 'addEventListener' in t
@@ -486,7 +488,7 @@
? t.addEventListener('onwheel' in t ? 'wheel' : 'mousewheel', r, !1)
: 'mouseenter' === i || 'mouseleave' === i
? ((r = function (i) {
- (i = i || window.event), Ct(t, i) && a(i);
+ ((i = i || window.event), Ct(t, i) && a(i));
}),
t.addEventListener(
'mouseenter' === i ? 'mouseover' : 'mouseout',
@@ -502,13 +504,13 @@
: 'attachEvent' in t && t.attachEvent('on' + i, r)
: F(t, r, s),
(t[ye] = t[ye] || {}),
- (t[ye][s] = r);
+ (t[ye][s] = r));
}
function vt(t, i, e, o) {
var s = i + n(e) + (o ? '_' + n(o) : ''),
r = t[ye] && t[ye][s];
if (!r) return this;
- Vi && 0 === i.indexOf('touch')
+ (Vi && 0 === i.indexOf('touch')
? I(t, i, s)
: !qi || 'dblclick' !== i || !U || (Vi && Ei)
? 'removeEventListener' in t
@@ -529,7 +531,7 @@
)
: 'detachEvent' in t && t.detachEvent('on' + i, r)
: U(t, s),
- (t[ye][s] = null);
+ (t[ye][s] = null));
}
function yt(t) {
return (
@@ -543,16 +545,20 @@
);
}
function xt(t) {
- return gt(t, 'mousewheel', yt), this;
+ return (gt(t, 'mousewheel', yt), this);
}
function wt(t) {
- return mt(t, 'mousedown touchstart dblclick', yt), gt(t, 'click', zt), this;
+ return (
+ mt(t, 'mousedown touchstart dblclick', yt),
+ gt(t, 'click', zt),
+ this
+ );
}
function Pt(t) {
- return t.preventDefault ? t.preventDefault() : (t.returnValue = !1), this;
+ return (t.preventDefault ? t.preventDefault() : (t.returnValue = !1), this);
}
function Lt(t) {
- return Pt(t), yt(t), this;
+ return (Pt(t), yt(t), this);
}
function bt(t, i) {
if (!i) return new x(t.clientX, t.clientY);
@@ -587,7 +593,7 @@
}
function Mt(t) {
var i = we[t.type];
- return (we[t.type] = !1), i;
+ return ((we[t.type] = !1), i);
}
function Ct(t, i) {
var e = i.relatedTarget;
@@ -609,7 +615,7 @@
function Zt(t, i) {
if (!i || !t.length) return t.slice();
var e = i * i;
- return (t = Bt(t, e)), (t = kt(t, e));
+ return ((t = Bt(t, e)), (t = kt(t, e)));
}
function Et(t, i, e) {
return Math.sqrt(Dt(t, i, e, !0));
@@ -617,7 +623,7 @@
function kt(t, i) {
var e = t.length,
n = new (typeof Uint8Array != void 0 + '' ? Uint8Array : Array)(e);
- (n[0] = n[e - 1] = 1), At(t, n, i, 0, e - 1);
+ ((n[0] = n[e - 1] = 1), At(t, n, i, 0, e - 1));
var o,
s = [];
for (o = 0; o < e; o++) n[o] && s.push(t[o]);
@@ -635,7 +641,7 @@
function Bt(t, i) {
for (var e = [t[0]], n = 1, o = 0, s = t.length; n < s; n++)
Nt(t[n], t[o]) > i && (e.push(t[n]), (o = n));
- return o < s - 1 && e.push(t[s - 1]), e;
+ return (o < s - 1 && e.push(t[s - 1]), e);
}
function It(t, i, e, n, o) {
var s,
@@ -646,8 +652,8 @@
for (ke = u; ; ) {
if (!(h | u)) return [t, i];
if (h & u) return !1;
- (a = Rt((r = Ot(t, i, (s = h || u), e, o)), e)),
- s === h ? ((t = r), (h = a)) : ((i = r), (u = a));
+ ((a = Rt((r = Ot(t, i, (s = h || u), e, o)), e)),
+ s === h ? ((t = r), (h = a)) : ((i = r), (u = a)));
}
}
function Ot(t, i, e, n, o) {
@@ -723,14 +729,14 @@
for (o = 0, u = t.length; o < u; o++) t[o]._code = Rt(t[o], i);
for (r = 0; r < 4; r++) {
for (l = _[r], n = [], o = 0, s = (u = t.length) - 1; o < u; s = o++)
- (a = t[o]),
+ ((a = t[o]),
(h = t[s]),
a._code & l
? h._code & l ||
(((c = Ot(h, a, l, i, e))._code = Rt(c, i)), n.push(c))
: (h._code & l &&
(((c = Ot(h, a, l, i, e))._code = Rt(c, i)), n.push(c)),
- n.push(a));
+ n.push(a)));
t = n;
}
return t;
@@ -748,17 +754,17 @@
if (!a && !r) return null;
switch (r.type) {
case 'Point':
- return (e = l(a)), u ? u(t, e) : new $e(e);
+ return ((e = l(a)), u ? u(t, e) : new $e(e));
case 'MultiPoint':
for (o = 0, s = a.length; o < s; o++)
- (e = l(a[o])), h.push(u ? u(t, e) : new $e(e));
+ ((e = l(a[o])), h.push(u ? u(t, e) : new $e(e)));
return new Ke(h);
case 'LineString':
case 'MultiLineString':
- return (n = Vt(a, 'LineString' === r.type ? 0 : 1, l)), new nn(n, i);
+ return ((n = Vt(a, 'LineString' === r.type ? 0 : 1, l)), new nn(n, i));
case 'Polygon':
case 'MultiPolygon':
- return (n = Vt(a, 'Polygon' === r.type ? 1 : 2, l)), new on(n, i);
+ return ((n = Vt(a, 'Polygon' === r.type ? 1 : 2, l)), new on(n, i));
case 'GeometryCollection':
for (o = 0, s = r.geometries.length; o < s; o++) {
var c = Ft(
@@ -781,7 +787,7 @@
}
function Vt(t, i, e) {
for (var n, o = [], s = 0, r = t.length; s < r; s++)
- (n = i ? Vt(t[s], i - 1, e) : (e || Ut)(t[s])), o.push(n);
+ ((n = i ? Vt(t[s], i - 1, e) : (e || Ut)(t[s])), o.push(n));
return o;
}
function qt(t, i) {
@@ -795,7 +801,7 @@
function Gt(t, i, e, n) {
for (var o = [], s = 0, r = t.length; s < r; s++)
o.push(i ? Gt(t[s], i - 1, e, n) : qt(t[s], n));
- return !i && e && o.push(o[0]), o;
+ return (!i && e && o.push(o[0]), o);
}
function Kt(t, e) {
return t.feature ? i({}, t.feature, { geometry: e }) : Yt(e);
@@ -826,7 +832,7 @@
(function () {
function t() {}
return function (i) {
- return (t.prototype = i), new t();
+ return ((t.prototype = i), new t());
};
})(),
ei = 0,
@@ -870,14 +876,14 @@
requestAnimFrame: f,
cancelAnimFrame: g,
});
- (v.extend = function (t) {
+ ((v.extend = function (t) {
var e = function () {
- this.initialize && this.initialize.apply(this, arguments),
- this.callInitHooks();
+ (this.initialize && this.initialize.apply(this, arguments),
+ this.callInitHooks());
},
n = (e.__super__ = this.prototype),
o = ii(n);
- (o.constructor = e), (e.prototype = o);
+ ((o.constructor = e), (e.prototype = o));
for (var s in this)
this.hasOwnProperty(s) &&
'prototype' !== s &&
@@ -894,8 +900,8 @@
(o._initHooks = []),
(o.callInitHooks = function () {
if (!this._initHooksCalled) {
- n.callInitHooks && n.callInitHooks.call(this),
- (this._initHooksCalled = !0);
+ (n.callInitHooks && n.callInitHooks.call(this),
+ (this._initHooksCalled = !0));
for (var t = 0, i = o._initHooks.length; t < i; t++)
o._initHooks[t].call(this);
}
@@ -904,10 +910,10 @@
);
}),
(v.include = function (t) {
- return i(this.prototype, t), this;
+ return (i(this.prototype, t), this);
}),
(v.mergeOptions = function (t) {
- return i(this.prototype.options, t), this;
+ return (i(this.prototype.options, t), this);
}),
(v.addInitHook = function (t) {
var i = Array.prototype.slice.call(arguments, 1),
@@ -922,7 +928,7 @@
this.prototype._initHooks.push(e),
this
);
- });
+ }));
var li = {
on: function (t, i, e) {
if ('object' == typeof t) for (var n in t) this._on(n, t[n], i);
@@ -942,7 +948,7 @@
_on: function (t, i, e) {
this._events = this._events || {};
var n = this._events[t];
- n || ((n = []), (this._events[t] = n)), e === this && (e = void 0);
+ (n || ((n = []), (this._events[t] = n)), e === this && (e = void 0));
for (var o = { fn: i, ctx: e }, s = n, r = 0, a = s.length; r < a; r++)
if (s[r].fn === i && s[r].ctx === e) return;
s.push(o);
@@ -984,7 +990,7 @@
this._firingCount--;
}
}
- return n && this._propagateEvent(o), this;
+ return (n && this._propagateEvent(o), this);
},
listens: function (t, i) {
var e = this._events && this._events[t];
@@ -1012,7 +1018,7 @@
);
},
removeEventParent: function (t) {
- return this._eventParents && delete this._eventParents[n(t)], this;
+ return (this._eventParents && delete this._eventParents[n(t)], this);
},
_propagateEvent: function (t) {
for (var e in this._eventParents)
@@ -1023,18 +1029,18 @@
);
},
};
- (li.addEventListener = li.on),
+ ((li.addEventListener = li.on),
(li.removeEventListener = li.clearAllEventListeners = li.off),
(li.addOneTimeEventListener = li.once),
(li.fireEvent = li.fire),
- (li.hasEventListeners = li.listens);
+ (li.hasEventListeners = li.listens));
var ci = v.extend(li),
_i =
Math.trunc ||
function (t) {
return t > 0 ? Math.floor(t) : Math.ceil(t);
};
- (x.prototype = {
+ ((x.prototype = {
clone: function () {
return new x(this.x, this.y);
},
@@ -1042,25 +1048,25 @@
return this.clone()._add(w(t));
},
_add: function (t) {
- return (this.x += t.x), (this.y += t.y), this;
+ return ((this.x += t.x), (this.y += t.y), this);
},
subtract: function (t) {
return this.clone()._subtract(w(t));
},
_subtract: function (t) {
- return (this.x -= t.x), (this.y -= t.y), this;
+ return ((this.x -= t.x), (this.y -= t.y), this);
},
divideBy: function (t) {
return this.clone()._divideBy(t);
},
_divideBy: function (t) {
- return (this.x /= t), (this.y /= t), this;
+ return ((this.x /= t), (this.y /= t), this);
},
multiplyBy: function (t) {
return this.clone()._multiplyBy(t);
},
_multiplyBy: function (t) {
- return (this.x *= t), (this.y *= t), this;
+ return ((this.x *= t), (this.y *= t), this);
},
scaleBy: function (t) {
return new x(this.x * t.x, this.y * t.y);
@@ -1072,25 +1078,33 @@
return this.clone()._round();
},
_round: function () {
- return (this.x = Math.round(this.x)), (this.y = Math.round(this.y)), this;
+ return (
+ (this.x = Math.round(this.x)),
+ (this.y = Math.round(this.y)),
+ this
+ );
},
floor: function () {
return this.clone()._floor();
},
_floor: function () {
- return (this.x = Math.floor(this.x)), (this.y = Math.floor(this.y)), this;
+ return (
+ (this.x = Math.floor(this.x)),
+ (this.y = Math.floor(this.y)),
+ this
+ );
},
ceil: function () {
return this.clone()._ceil();
},
_ceil: function () {
- return (this.x = Math.ceil(this.x)), (this.y = Math.ceil(this.y)), this;
+ return ((this.x = Math.ceil(this.x)), (this.y = Math.ceil(this.y)), this);
},
trunc: function () {
return this.clone()._trunc();
},
_trunc: function () {
- return (this.x = _i(this.x)), (this.y = _i(this.y)), this;
+ return ((this.x = _i(this.x)), (this.y = _i(this.y)), this);
},
distanceTo: function (t) {
var i = (t = w(t)).x - this.x,
@@ -1189,7 +1203,7 @@
e,
n = this._southWest,
o = this._northEast;
- if (t instanceof M) (i = t), (e = t);
+ if (t instanceof M) ((i = t), (e = t));
else {
if (!(t instanceof T)) return t ? this.extend(C(t) || z(t)) : this;
if (((i = t._southWest), (e = t._northEast), !i || !e)) return this;
@@ -1322,7 +1336,7 @@
clone: function () {
return new M(this.lat, this.lng, this.alt);
},
- });
+ }));
var di = {
latLngToPoint: function (t, i) {
var e = this.projection.project(t),
@@ -1562,12 +1576,12 @@
? _e + 'End'
: 'transitionend';
if ('onselectstart' in document)
- (fi = function () {
+ ((fi = function () {
mt(window, 'selectstart', Pt);
}),
(gi = function () {
ft(window, 'selectstart', Pt);
- });
+ }));
else {
var pe = st([
'userSelect',
@@ -1576,15 +1590,15 @@
'MozUserSelect',
'msUserSelect',
]);
- (fi = function () {
+ ((fi = function () {
if (pe) {
var t = document.documentElement.style;
- (vi = t[pe]), (t[pe] = 'none');
+ ((vi = t[pe]), (t[pe] = 'none'));
}
}),
(gi = function () {
pe && ((document.documentElement.style[pe] = vi), (vi = void 0));
- });
+ }));
}
var me,
fe,
@@ -1641,7 +1655,7 @@
}),
Le = ci.extend({
run: function (t, i, e, n) {
- this.stop(),
+ (this.stop(),
(this._el = t),
(this._inProgress = !0),
(this._duration = e || 0.25),
@@ -1650,13 +1664,13 @@
(this._offset = i.subtract(this._startPos)),
(this._startTime = +new Date()),
this.fire('start'),
- this._animate();
+ this._animate());
},
stop: function () {
this._inProgress && (this._step(!0), this._complete());
},
_animate: function () {
- (this._animId = f(this._animate, this)), this._step();
+ ((this._animId = f(this._animate, this)), this._step());
},
_step: function (t) {
var i = +new Date() - this._startTime,
@@ -1667,10 +1681,10 @@
},
_runFrame: function (t, i) {
var e = this._startPos.add(this._offset.multiplyBy(t));
- i && e._round(), at(this._el, e), this.fire('step');
+ (i && e._round(), at(this._el, e), this.fire('step'));
},
_complete: function () {
- g(this._animId), (this._inProgress = !1), this.fire('end');
+ (g(this._animId), (this._inProgress = !1), this.fire('end'));
},
_easeOut: function (t) {
return 1 - Math.pow(1 - t, this._easeOutPower);
@@ -1696,7 +1710,7 @@
trackResize: !0,
},
initialize: function (t, i) {
- (i = l(this, i)),
+ ((i = l(this, i)),
this._initContainer(t),
this._initLayout(),
(this._onResize = e(this._onResize, this)),
@@ -1715,7 +1729,7 @@
this._zoomAnimated &&
(this._createAnimProxy(),
mt(this._proxy, de, this._catchTransitionEnd, this)),
- this._addLayers(this.options.layers);
+ this._addLayers(this.options.layers));
},
setView: function (t, e, n) {
return (
@@ -1763,7 +1777,7 @@
return this.setView(r, i, { zoom: e });
},
_getBoundsCenterZoom: function (t, i) {
- (i = i || {}), (t = t.getBounds ? t.getBounds() : z(t));
+ ((i = i || {}), (t = t.getBounds ? t.getBounds() : z(t)));
var e = w(i.paddingTopLeft || i.padding || [0, 0]),
n = w(i.paddingBottomRight || i.padding || [0, 0]),
o = this.getBoundsZoom(t, !1, e.add(n));
@@ -1829,7 +1843,7 @@
i.duration || 0.25,
i.easeLinearity
);
- } else this._rawPanBy(t), this.fire('move').fire('moveend');
+ } else (this._rawPanBy(t), this.fire('move').fire('moveend'));
return this;
},
flyTo: function (t, i, e) {
@@ -1876,7 +1890,7 @@
_ = this.project(t),
d = this.getSize(),
p = this._zoom;
- (t = C(t)), (i = void 0 === i ? p : i);
+ ((t = C(t)), (i = void 0 === i ? p : i));
var m = Math.max(d.x, d.y),
g = m * this.getZoomScale(p, i),
v = _.distanceTo(c) || 1,
@@ -1886,7 +1900,7 @@
P = Date.now(),
L = (n(1) - w) / y,
b = e.duration ? 1e3 * e.duration : 1e3 * L * 0.8;
- return this._moveStart(!0, e.noMoveStart), l.call(this), this;
+ return (this._moveStart(!0, e.noMoveStart), l.call(this), this);
},
flyToBounds: function (t, i) {
var e = this._getBoundsCenterZoom(t, i);
@@ -1929,14 +1943,16 @@
var e = this.getCenter(),
n = this._limitCenter(e, this._zoom, z(t));
return (
- e.equals(n) || this.panTo(n, i), (this._enforcingBounds = !1), this
+ e.equals(n) || this.panTo(n, i),
+ (this._enforcingBounds = !1),
+ this
);
},
invalidateSize: function (t) {
if (!this._loaded) return this;
t = i({ animate: !1, pan: !0 }, !0 === t ? { animate: !0 } : t);
var n = this.getSize();
- (this._sizeChanged = !0), (this._lastCenter = null);
+ ((this._sizeChanged = !0), (this._lastCenter = null));
var o = this.getSize(),
s = n.divideBy(2).round(),
r = o.divideBy(2).round(),
@@ -2006,11 +2022,11 @@
: 2 === i
? 'position unavailable'
: 'timeout');
- this._locateOptions.setView && !this._loaded && this.fitWorld(),
+ (this._locateOptions.setView && !this._loaded && this.fitWorld(),
this.fire('locationerror', {
code: i,
message: 'Geolocation error: ' + e + '.',
- });
+ }));
},
_handleGeolocationResponse: function (t) {
var i = new M(t.coords.latitude, t.coords.longitude),
@@ -2028,7 +2044,7 @@
addHandler: function (t, i) {
if (!i) return this;
var e = (this[t] = new i(this));
- return this._handlers.push(e), this.options[t] && e.enable(), this;
+ return (this._handlers.push(e), this.options[t] && e.enable(), this);
},
remove: function () {
if (
@@ -2037,18 +2053,19 @@
)
throw new Error('Map container is being reused by another instance');
try {
- delete this._container._leaflet_id, delete this._containerId;
+ (delete this._container._leaflet_id, delete this._containerId);
} catch (t) {
- (this._container._leaflet_id = void 0), (this._containerId = void 0);
+ ((this._container._leaflet_id = void 0),
+ (this._containerId = void 0));
}
- void 0 !== this._locationWatchId && this.stopLocate(),
+ (void 0 !== this._locationWatchId && this.stopLocate(),
this._stop(),
K(this._mapPane),
this._clearControlPos && this._clearControlPos(),
this._resizeRequest &&
(g(this._resizeRequest), (this._resizeRequest = null)),
this._clearHandlers(),
- this._loaded && this.fire('unload');
+ this._loaded && this.fire('unload'));
var t;
for (t in this._layers) this._layers[t].remove();
for (t in this._panes) K(this._panes[t]);
@@ -2067,7 +2084,7 @@
(t ? ' leaflet-' + t.replace('Pane', '') + '-pane' : ''),
i || this._mapPane
);
- return t && (this._panes[t] = e), e;
+ return (t && (this._panes[t] = e), e);
},
getCenter: function () {
return (
@@ -2100,7 +2117,7 @@
: this.options.maxZoom;
},
getBoundsZoom: function (t, i, e) {
- (t = z(t)), (e = w(e || [0, 0]));
+ ((t = z(t)), (e = w(e || [0, 0])));
var n = this.getZoom() || 0,
o = this.getMinZoom(),
s = this.getMaxZoom(),
@@ -2136,7 +2153,7 @@
return new P(e, e.add(this.getSize()));
},
getPixelOrigin: function () {
- return this._checkIfLoaded(), this._pixelOrigin;
+ return (this._checkIfLoaded(), this._pixelOrigin);
},
getPixelWorldBounds: function (t) {
return this.options.crs.getProjectedBounds(
@@ -2154,7 +2171,7 @@
},
getZoomScale: function (t, i) {
var e = this.options.crs;
- return (i = void 0 === i ? this._zoom : i), e.scale(t) / e.scale(i);
+ return ((i = void 0 === i ? this._zoom : i), e.scale(t) / e.scale(i));
},
getScaleZoom: function (t, i) {
var e = this.options.crs;
@@ -2219,11 +2236,11 @@
if (!i) throw new Error('Map container not found.');
if (i._leaflet_id)
throw new Error('Map container is already initialized.');
- mt(i, 'scroll', this._onScroll, this), (this._containerId = n(i));
+ (mt(i, 'scroll', this._onScroll, this), (this._containerId = n(i)));
},
_initLayout: function () {
var t = this._container;
- (this._fadeAnimated = this.options.fadeAnimation && ji),
+ ((this._fadeAnimated = this.options.fadeAnimation && ji),
Q(
t,
'leaflet-container' +
@@ -2232,18 +2249,18 @@
(Li ? ' leaflet-oldie' : '') +
(Ai ? ' leaflet-safari' : '') +
(this._fadeAnimated ? ' leaflet-fade-anim' : '')
- );
+ ));
var i = q(t, 'position');
- 'absolute' !== i &&
+ ('absolute' !== i &&
'relative' !== i &&
'fixed' !== i &&
(t.style.position = 'relative'),
this._initPanes(),
- this._initControlPos && this._initControlPos();
+ this._initControlPos && this._initControlPos());
},
_initPanes: function () {
var t = (this._panes = {});
- (this._paneRenderers = {}),
+ ((this._paneRenderers = {}),
(this._mapPane = this.createPane('mapPane', this._container)),
at(this._mapPane, new x(0, 0)),
this.createPane('tilePane'),
@@ -2254,21 +2271,21 @@
this.createPane('popupPane'),
this.options.markerZoomAnimation ||
(Q(t.markerPane, 'leaflet-zoom-hide'),
- Q(t.shadowPane, 'leaflet-zoom-hide'));
+ Q(t.shadowPane, 'leaflet-zoom-hide')));
},
_resetView: function (t, i) {
at(this._mapPane, new x(0, 0));
var e = !this._loaded;
- (this._loaded = !0),
+ ((this._loaded = !0),
(i = this._limitZoom(i)),
- this.fire('viewprereset');
+ this.fire('viewprereset'));
var n = this._zoom !== i;
- this._moveStart(n, !1)._move(t, i)._moveEnd(n),
+ (this._moveStart(n, !1)._move(t, i)._moveEnd(n),
this.fire('viewreset'),
- e && this.fire('load');
+ e && this.fire('load'));
},
_moveStart: function (t, i) {
- return t && this.fire('zoomstart'), i || this.fire('movestart'), this;
+ return (t && this.fire('zoomstart'), i || this.fire('movestart'), this);
},
_move: function (t, i, e) {
void 0 === i && (i = this._zoom);
@@ -2282,10 +2299,14 @@
);
},
_moveEnd: function (t) {
- return t && this.fire('zoomend'), this.fire('moveend');
+ return (t && this.fire('zoomend'), this.fire('moveend'));
},
_stop: function () {
- return g(this._flyToFrame), this._panAnim && this._panAnim.stop(), this;
+ return (
+ g(this._flyToFrame),
+ this._panAnim && this._panAnim.stop(),
+ this
+ );
},
_rawPanBy: function (t) {
at(this._mapPane, this._getMapPanePos().subtract(t));
@@ -2300,9 +2321,9 @@
if (!this._loaded) throw new Error('Set map center and zoom first.');
},
_initEvents: function (t) {
- (this._targets = {}), (this._targets[n(this._container)] = this);
+ ((this._targets = {}), (this._targets[n(this._container)] = this));
var i = t ? ft : mt;
- i(
+ (i(
this._container,
'click dblclick mousedown mouseup mouseover mouseout mousemove contextmenu keypress',
this._handleDOMEvent,
@@ -2311,16 +2332,16 @@
this.options.trackResize && i(window, 'resize', this._onResize, this),
ji &&
this.options.transform3DLimit &&
- (t ? this.off : this.on).call(this, 'moveend', this._onMoveEnd);
+ (t ? this.off : this.on).call(this, 'moveend', this._onMoveEnd));
},
_onResize: function () {
- g(this._resizeRequest),
+ (g(this._resizeRequest),
(this._resizeRequest = f(function () {
this.invalidateSize({ debounceMoveend: !0 });
- }, this));
+ }, this)));
},
_onScroll: function () {
- (this._container.scrollTop = 0), (this._container.scrollLeft = 0);
+ ((this._container.scrollTop = 0), (this._container.scrollLeft = 0));
},
_onMoveEnd: function () {
var t = this._getMapPanePos();
@@ -2354,14 +2375,14 @@
if (r === this._container) break;
r = r.parentNode;
}
- return o.length || a || s || !Ct(r, t) || (o = [this]), o;
+ return (o.length || a || s || !Ct(r, t) || (o = [this]), o);
},
_handleDOMEvent: function (t) {
if (this._loaded && !Mt(t)) {
var i = t.type;
- ('mousedown' !== i && 'keypress' !== i) ||
+ (('mousedown' !== i && 'keypress' !== i) ||
ct(t.target || t.srcElement),
- this._fireDOMEvent(t, i);
+ this._fireDOMEvent(t, i));
}
},
_mouseEvents: [
@@ -2374,7 +2395,7 @@
_fireDOMEvent: function (t, e, n) {
if ('click' === t.type) {
var o = i({}, t);
- (o.type = 'preclick'), this._fireDOMEvent(o, o.type, n);
+ ((o.type = 'preclick'), this._fireDOMEvent(o, o.type, n));
}
if (
!t._stopped &&
@@ -2385,7 +2406,7 @@
var r = { originalEvent: t };
if ('keypress' !== t.type) {
var a = s.getLatLng && (!s._radius || s._radius <= 10);
- (r.containerPoint = a
+ ((r.containerPoint = a
? this.latLngToContainerPoint(s.getLatLng())
: this.mouseEventToContainerPoint(t)),
(r.layerPoint = this.containerPointToLayerPoint(
@@ -2393,7 +2414,7 @@
)),
(r.latlng = a
? s.getLatLng()
- : this.layerPointToLatLng(r.layerPoint));
+ : this.layerPointToLatLng(r.layerPoint)));
}
for (var h = 0; h < n.length; h++)
if (
@@ -2496,13 +2517,13 @@
var i = this.getMinZoom(),
e = this.getMaxZoom(),
n = ji ? this.options.zoomSnap : 1;
- return n && (t = Math.round(t / n) * n), Math.max(i, Math.min(e, t));
+ return (n && (t = Math.round(t / n) * n), Math.max(i, Math.min(e, t)));
},
_onPanTransitionStep: function () {
this.fire('move');
},
_onPanTransitionEnd: function () {
- tt(this._mapPane, 'leaflet-pan-anim'), this.fire('moveend');
+ (tt(this._mapPane, 'leaflet-pan-anim'), this.fire('moveend'));
},
_tryAnimatedPan: function (t, i) {
var e = this._getCenterOffset(t)._trunc();
@@ -2513,20 +2534,20 @@
},
_createAnimProxy: function () {
var t = (this._proxy = G('div', 'leaflet-proxy leaflet-zoom-animated'));
- this._panes.mapPane.appendChild(t),
+ (this._panes.mapPane.appendChild(t),
this.on(
'zoomanim',
function (t) {
var i = ce,
e = this._proxy.style[i];
- rt(
+ (rt(
this._proxy,
this.project(t.center, t.zoom),
this.getZoomScale(t.zoom, 1)
),
e === this._proxy.style[i] &&
this._animatingZoom &&
- this._onZoomTransitionEnd();
+ this._onZoomTransitionEnd());
},
this
),
@@ -2539,10 +2560,10 @@
},
this
),
- this._on('unload', this._destroyAnimProxy, this);
+ this._on('unload', this._destroyAnimProxy, this));
},
_destroyAnimProxy: function () {
- K(this._proxy), delete this._proxy;
+ (K(this._proxy), delete this._proxy);
},
_catchTransitionEnd: function (t) {
this._animatingZoom &&
@@ -2614,7 +2635,7 @@
return this._container;
},
addTo: function (t) {
- this.remove(), (this._map = t);
+ (this.remove(), (this._map = t));
var i = (this._container = this.onAdd(t)),
e = this.getPosition(),
n = t._controlCorners[e];
@@ -2647,10 +2668,10 @@
};
be.include({
addControl: function (t) {
- return t.addTo(this), this;
+ return (t.addTo(this), this);
},
removeControl: function (t) {
- return t.remove(), this;
+ return (t.remove(), this);
},
_initControlPos: function () {
function t(t, o) {
@@ -2664,16 +2685,16 @@
e + 'control-container',
this._container
));
- t('top', 'left'),
+ (t('top', 'left'),
t('top', 'right'),
t('bottom', 'left'),
- t('bottom', 'right');
+ t('bottom', 'right'));
},
_clearControlPos: function () {
for (var t in this._controlCorners) K(this._controlCorners[t]);
- K(this._controlContainer),
+ (K(this._controlContainer),
delete this._controlCorners,
- delete this._controlContainer;
+ delete this._controlContainer);
},
});
var Me = Te.extend({
@@ -2688,25 +2709,25 @@
},
},
initialize: function (t, i, e) {
- l(this, e),
+ (l(this, e),
(this._layerControlInputs = []),
(this._layers = []),
(this._lastZIndex = 0),
- (this._handlingClick = !1);
+ (this._handlingClick = !1));
for (var n in t) this._addLayer(t[n], n);
for (n in i) this._addLayer(i[n], n, !0);
},
onAdd: function (t) {
- this._initLayout(),
+ (this._initLayout(),
this._update(),
(this._map = t),
- t.on('zoomend', this._checkDisabledLayers, this);
+ t.on('zoomend', this._checkDisabledLayers, this));
for (var i = 0; i < this._layers.length; i++)
this._layers[i].layer.on('add remove', this._onLayerChange, this);
return this._container;
},
addTo: function (t) {
- return Te.prototype.addTo.call(this, t), this._expandIfNotCollapsed();
+ return (Te.prototype.addTo.call(this, t), this._expandIfNotCollapsed());
},
onRemove: function () {
this._map.off('zoomend', this._checkDisabledLayers, this);
@@ -2714,10 +2735,10 @@
this._layers[t].layer.off('add remove', this._onLayerChange, this);
},
addBaseLayer: function (t, i) {
- return this._addLayer(t, i), this._map ? this._update() : this;
+ return (this._addLayer(t, i), this._map ? this._update() : this);
},
addOverlay: function (t, i) {
- return this._addLayer(t, i, !0), this._map ? this._update() : this;
+ return (this._addLayer(t, i, !0), this._map ? this._update() : this);
},
removeLayer: function (t) {
t.off('add remove', this._onLayerChange, this);
@@ -2728,8 +2749,8 @@
);
},
expand: function () {
- Q(this._container, 'leaflet-control-layers-expanded'),
- (this._form.style.height = null);
+ (Q(this._container, 'leaflet-control-layers-expanded'),
+ (this._form.style.height = null));
var t = this._map.getSize().y - (this._container.offsetTop + 50);
return (
t < this._form.clientHeight
@@ -2741,13 +2762,13 @@
);
},
collapse: function () {
- return tt(this._container, 'leaflet-control-layers-expanded'), this;
+ return (tt(this._container, 'leaflet-control-layers-expanded'), this);
},
_initLayout: function () {
var t = 'leaflet-control-layers',
i = (this._container = G('div', t)),
e = this.options.collapsed;
- i.setAttribute('aria-haspopup', !0), wt(i), xt(i);
+ (i.setAttribute('aria-haspopup', !0), wt(i), xt(i));
var n = (this._form = G('form', t + '-list'));
e &&
(this._map.on('click', this.collapse, this),
@@ -2758,7 +2779,7 @@
this
));
var o = (this._layersLink = G('a', t + '-toggle', i));
- (o.href = '#'),
+ ((o.href = '#'),
(o.title = 'Layers'),
qi
? (mt(o, 'click', Lt), mt(o, 'click', this.expand, this))
@@ -2767,7 +2788,7 @@
(this._baseLayersList = G('div', t + '-base', n)),
(this._separator = G('div', t + '-separator', n)),
(this._overlaysList = G('div', t + '-overlays', n)),
- i.appendChild(n);
+ i.appendChild(n));
},
_getLayer: function (t) {
for (var i = 0; i < this._layers.length; i++)
@@ -2775,7 +2796,7 @@
return this._layers[i];
},
_addLayer: function (t, i, n) {
- this._map && t.on('add remove', this._onLayerChange, this),
+ (this._map && t.on('add remove', this._onLayerChange, this),
this._layers.push({ layer: t, name: i, overlay: n }),
this.options.sortLayers &&
this._layers.sort(
@@ -2791,24 +2812,24 @@
this.options.autoZIndex &&
t.setZIndex &&
(this._lastZIndex++, t.setZIndex(this._lastZIndex)),
- this._expandIfNotCollapsed();
+ this._expandIfNotCollapsed());
},
_update: function () {
if (!this._container) return this;
- Y(this._baseLayersList),
+ (Y(this._baseLayersList),
Y(this._overlaysList),
- (this._layerControlInputs = []);
+ (this._layerControlInputs = []));
var t,
i,
e,
n,
o = 0;
for (e = 0; e < this._layers.length; e++)
- (n = this._layers[e]),
+ ((n = this._layers[e]),
this._addItem(n),
(i = i || n.overlay),
(t = t || !n.overlay),
- (o += n.overlay ? 0 : 1);
+ (o += n.overlay ? 0 : 1));
return (
this.options.hideSingleBase &&
((t = t && o > 1),
@@ -2837,20 +2858,20 @@
(i ? ' checked="checked"' : '') +
'/>',
n = document.createElement('div');
- return (n.innerHTML = e), n.firstChild;
+ return ((n.innerHTML = e), n.firstChild);
},
_addItem: function (t) {
var i,
e = document.createElement('label'),
o = this._map.hasLayer(t.layer);
- t.overlay
+ (t.overlay
? (((i = document.createElement('input')).type = 'checkbox'),
(i.className = 'leaflet-control-layers-selector'),
(i.defaultChecked = o))
: (i = this._createRadioElement('leaflet-base-layers', o)),
this._layerControlInputs.push(i),
(i.layerId = n(t.layer)),
- mt(i, 'click', this._onInputClick, this);
+ mt(i, 'click', this._onInputClick, this));
var s = document.createElement('span');
s.innerHTML = ' ' + t.name;
var r = document.createElement('div');
@@ -2873,14 +2894,14 @@
o = [];
this._handlingClick = !0;
for (var s = e.length - 1; s >= 0; s--)
- (t = e[s]),
+ ((t = e[s]),
(i = this._getLayer(t.layerId).layer),
- t.checked ? n.push(i) : t.checked || o.push(i);
+ t.checked ? n.push(i) : t.checked || o.push(i));
for (s = 0; s < o.length; s++)
this._map.hasLayer(o[s]) && this._map.removeLayer(o[s]);
for (s = 0; s < n.length; s++)
this._map.hasLayer(n[s]) || this._map.addLayer(n[s]);
- (this._handlingClick = !1), this._refocusOnMap();
+ ((this._handlingClick = !1), this._refocusOnMap());
},
_checkDisabledLayers: function () {
for (
@@ -2892,14 +2913,14 @@
o >= 0;
o--
)
- (t = e[o]),
+ ((t = e[o]),
(i = this._getLayer(t.layerId).layer),
(t.disabled =
(void 0 !== i.options.minZoom && n < i.options.minZoom) ||
- (void 0 !== i.options.maxZoom && n > i.options.maxZoom));
+ (void 0 !== i.options.maxZoom && n > i.options.maxZoom)));
},
_expandIfNotCollapsed: function () {
- return this._map && !this.options.collapsed && this.expand(), this;
+ return (this._map && !this.options.collapsed && this.expand(), this);
},
_expand: function () {
return this.expand();
@@ -2944,10 +2965,10 @@
t.off('zoomend zoomlevelschange', this._updateDisabled, this);
},
disable: function () {
- return (this._disabled = !0), this._updateDisabled(), this;
+ return ((this._disabled = !0), this._updateDisabled(), this);
},
enable: function () {
- return (this._disabled = !1), this._updateDisabled(), this;
+ return ((this._disabled = !1), this._updateDisabled(), this);
},
_zoomIn: function (t) {
!this._disabled &&
@@ -2977,19 +2998,19 @@
_updateDisabled: function () {
var t = this._map,
i = 'leaflet-disabled';
- tt(this._zoomInButton, i),
+ (tt(this._zoomInButton, i),
tt(this._zoomOutButton, i),
(this._disabled || t._zoom === t.getMinZoom()) &&
Q(this._zoomOutButton, i),
(this._disabled || t._zoom === t.getMaxZoom()) &&
- Q(this._zoomInButton, i);
+ Q(this._zoomInButton, i));
},
});
- be.mergeOptions({ zoomControl: !0 }),
+ (be.mergeOptions({ zoomControl: !0 }),
be.addInitHook(function () {
this.options.zoomControl &&
((this.zoomControl = new Ce()), this.addControl(this.zoomControl));
- });
+ }));
var Se = Te.extend({
options: {
position: 'bottomleft',
@@ -3015,8 +3036,8 @@
);
},
_addScales: function (t, i, e) {
- t.metric && (this._mScale = G('div', i, e)),
- t.imperial && (this._iScale = G('div', i, e));
+ (t.metric && (this._mScale = G('div', i, e)),
+ t.imperial && (this._iScale = G('div', i, e)));
},
_update: function () {
var t = this._map,
@@ -3028,8 +3049,8 @@
this._updateScales(e);
},
_updateScales: function (t) {
- this.options.metric && t && this._updateMetric(t),
- this.options.imperial && t && this._updateImperial(t);
+ (this.options.metric && t && this._updateMetric(t),
+ this.options.imperial && t && this._updateImperial(t));
},
_updateMetric: function (t) {
var i = this._getRoundNum(t),
@@ -3049,14 +3070,15 @@
this._updateScale(this._iScale, n + ' ft', n / o));
},
_updateScale: function (t, i, e) {
- (t.style.width = Math.round(this.options.maxWidth * e) + 'px'),
- (t.innerHTML = i);
+ ((t.style.width = Math.round(this.options.maxWidth * e) + 'px'),
+ (t.innerHTML = i));
},
_getRoundNum: function (t) {
var i = Math.pow(10, (Math.floor(t) + '').length - 1),
e = t / i;
return (
- (e = e >= 10 ? 10 : e >= 5 ? 5 : e >= 3 ? 3 : e >= 2 ? 2 : 1), i * e
+ (e = e >= 10 ? 10 : e >= 5 ? 5 : e >= 3 ? 3 : e >= 2 ? 2 : 1),
+ i * e
);
},
}),
@@ -3067,19 +3089,19 @@
'
Leaflet',
},
initialize: function (t) {
- l(this, t), (this._attributions = {});
+ (l(this, t), (this._attributions = {}));
},
onAdd: function (t) {
- (t.attributionControl = this),
+ ((t.attributionControl = this),
(this._container = G('div', 'leaflet-control-attribution')),
- wt(this._container);
+ wt(this._container));
for (var i in t._layers)
t._layers[i].getAttribution &&
this.addAttribution(t._layers[i].getAttribution());
- return this._update(), this._container;
+ return (this._update(), this._container);
},
setPrefix: function (t) {
- return (this.options.prefix = t), this._update(), this;
+ return ((this.options.prefix = t), this._update(), this);
},
addAttribution: function (t) {
return t
@@ -3100,17 +3122,17 @@
var t = [];
for (var i in this._attributions) this._attributions[i] && t.push(i);
var e = [];
- this.options.prefix && e.push(this.options.prefix),
+ (this.options.prefix && e.push(this.options.prefix),
t.length && e.push(t.join(', ')),
- (this._container.innerHTML = e.join(' | '));
+ (this._container.innerHTML = e.join(' | ')));
}
},
});
- be.mergeOptions({ attributionControl: !0 }),
+ (be.mergeOptions({ attributionControl: !0 }),
be.addInitHook(function () {
this.options.attributionControl && new Ze().addTo(this);
- });
- (Te.Layers = Me),
+ }));
+ ((Te.Layers = Me),
(Te.Zoom = Ce),
(Te.Scale = Se),
(Te.Attribution = Ze),
@@ -3125,7 +3147,7 @@
}),
(ze.attribution = function (t) {
return new Ze(t);
- });
+ }));
var Ee = v.extend({
initialize: function (t) {
this._map = t;
@@ -3145,7 +3167,7 @@
},
});
Ee.addTo = function (t, i) {
- return t.addHandler(i, this), this;
+ return (t.addHandler(i, this), this);
};
var ke,
Ae = { Events: li },
@@ -3165,10 +3187,10 @@
Re = ci.extend({
options: { clickTolerance: 3 },
initialize: function (t, i, e, n) {
- l(this, n),
+ (l(this, n),
(this._element = t),
(this._dragStartTarget = i || t),
- (this._preventOutline = e);
+ (this._preventOutline = e));
},
enable: function () {
this._enabled ||
@@ -3202,10 +3224,10 @@
this.fire('down');
var i = t.touches ? t.touches[0] : t,
e = dt(this._element);
- (this._startPoint = new x(i.clientX, i.clientY)),
+ ((this._startPoint = new x(i.clientX, i.clientY)),
(this._parentScale = pt(e)),
mt(document, Oe[t.type], this._onMove, this),
- mt(document, Ie[t.type], this._onUp, this);
+ mt(document, Ie[t.type], this._onUp, this));
}
},
_onMove: function (t) {
@@ -3239,22 +3261,22 @@
},
_updatePosition: function () {
var t = { originalEvent: this._lastEvent };
- this.fire('predrag', t),
+ (this.fire('predrag', t),
at(this._element, this._newPos),
- this.fire('drag', t);
+ this.fire('drag', t));
},
_onUp: function (t) {
!t._simulated && this._enabled && this.finishDrag();
},
finishDrag: function () {
- tt(document.body, 'leaflet-dragging'),
+ (tt(document.body, 'leaflet-dragging'),
this._lastTarget &&
(tt(this._lastTarget, 'leaflet-drag-target'),
- (this._lastTarget = null));
+ (this._lastTarget = null)));
for (var t in Oe)
- ft(document, Oe[t], this._onMove, this),
- ft(document, Ie[t], this._onUp, this);
- lt(),
+ (ft(document, Oe[t], this._onMove, this),
+ ft(document, Ie[t], this._onUp, this));
+ (lt(),
gi(),
this._moved &&
this._moving &&
@@ -3263,7 +3285,7 @@
distance: this._newPos.distanceTo(this._startPos),
})),
(this._moving = !1),
- (Re._dragging = !1);
+ (Re._dragging = !1));
},
}),
Ne = (Object.freeze || Object)({
@@ -3305,7 +3327,10 @@
r = s * Math.sin(n),
a =
Math.tan(Math.PI / 4 - n / 2) / Math.pow((1 - r) / (1 + r), s / 2);
- return (n = -e * Math.log(Math.max(a, 1e-10))), new x(t.lng * i * e, n);
+ return (
+ (n = -e * Math.log(Math.max(a, 1e-10))),
+ new x(t.lng * i * e, n)
+ );
},
unproject: function (t) {
for (
@@ -3321,9 +3346,9 @@
h < 15 && Math.abs(u) > 1e-7;
h++
)
- (i = s * Math.sin(a)),
+ ((i = s * Math.sin(a)),
(i = Math.pow((1 - i) / (1 + i), s / 2)),
- (a += u = Math.PI / 2 - 2 * Math.atan(r * i) - a);
+ (a += u = Math.PI / 2 - 2 * Math.atan(r * i) - a));
return new M(a * e, (t.x * e) / n);
},
},
@@ -3361,12 +3386,12 @@
},
infinite: !0,
});
- (di.Earth = pi),
+ ((di.Earth = pi),
(di.EPSG3395 = Fe),
(di.EPSG3857 = yi),
(di.EPSG900913 = xi),
(di.EPSG4326 = Ue),
- (di.Simple = Ve);
+ (di.Simple = Ve));
var qe = ci.extend({
options: {
pane: 'overlayPane',
@@ -3374,22 +3399,22 @@
bubblingMouseEvents: !0,
},
addTo: function (t) {
- return t.addLayer(this), this;
+ return (t.addLayer(this), this);
},
remove: function () {
return this.removeFrom(this._map || this._mapToAdd);
},
removeFrom: function (t) {
- return t && t.removeLayer(this), this;
+ return (t && t.removeLayer(this), this);
},
getPane: function (t) {
return this._map.getPane(t ? this.options[t] || t : this.options.pane);
},
addInteractiveTarget: function (t) {
- return (this._map._targets[n(t)] = this), this;
+ return ((this._map._targets[n(t)] = this), this);
},
removeInteractiveTarget: function (t) {
- return delete this._map._targets[n(t)], this;
+ return (delete this._map._targets[n(t)], this);
},
getAttribution: function () {
return this.options.attribution;
@@ -3403,21 +3428,21 @@
this.getEvents)
) {
var e = this.getEvents();
- i.on(e, this),
+ (i.on(e, this),
this.once(
'remove',
function () {
i.off(e, this);
},
this
- );
+ ));
}
- this.onAdd(i),
+ (this.onAdd(i),
this.getAttribution &&
i.attributionControl &&
i.attributionControl.addAttribution(this.getAttribution()),
this.fire('add'),
- i.fire('layeradd', { layer: this });
+ i.fire('layeradd', { layer: this }));
}
},
});
@@ -3473,10 +3498,10 @@
e = this._getZoomSpan();
for (var n in this._zoomBoundLayers) {
var o = this._zoomBoundLayers[n].options;
- (t = void 0 === o.minZoom ? t : Math.min(t, o.minZoom)),
- (i = void 0 === o.maxZoom ? i : Math.max(i, o.maxZoom));
+ ((t = void 0 === o.minZoom ? t : Math.min(t, o.minZoom)),
+ (i = void 0 === o.maxZoom ? i : Math.max(i, o.maxZoom)));
}
- (this._layersMaxZoom = i === -1 / 0 ? void 0 : i),
+ ((this._layersMaxZoom = i === -1 / 0 ? void 0 : i),
(this._layersMinZoom = t === 1 / 0 ? void 0 : t),
e !== this._getZoomSpan() && this.fire('zoomlevelschange'),
void 0 === this.options.maxZoom &&
@@ -3486,18 +3511,22 @@
void 0 === this.options.minZoom &&
this._layersMinZoom &&
this.getZoom() < this._layersMinZoom &&
- this.setZoom(this._layersMinZoom);
+ this.setZoom(this._layersMinZoom));
},
});
var Ge = qe.extend({
initialize: function (t, i) {
- l(this, i), (this._layers = {});
+ (l(this, i), (this._layers = {}));
var e, n;
if (t) for (e = 0, n = t.length; e < n; e++) this.addLayer(t[e]);
},
addLayer: function (t) {
var i = this.getLayerId(t);
- return (this._layers[i] = t), this._map && this._map.addLayer(t), this;
+ return (
+ (this._layers[i] = t),
+ this._map && this._map.addLayer(t),
+ this
+ );
},
removeLayer: function (t) {
var i = t in this._layers ? t : this.getLayerId(t);
@@ -3537,7 +3566,7 @@
},
getLayers: function () {
var t = [];
- return this.eachLayer(t.push, t), t;
+ return (this.eachLayer(t.push, t), t);
},
setZIndex: function (t) {
return this.invoke('setZIndex', t);
@@ -3599,7 +3628,7 @@
return null;
}
var n = this._createImg(e, i && 'IMG' === i.tagName ? i : null);
- return this._setIconStyles(n, t), n;
+ return (this._setIconStyles(n, t), n);
},
_setIconStyles: function (t, i) {
var e = this.options,
@@ -3611,14 +3640,14 @@
e.iconAnchor ||
(o && o.divideBy(2, !0))
);
- (t.className = 'leaflet-marker-' + i + ' ' + (e.className || '')),
+ ((t.className = 'leaflet-marker-' + i + ' ' + (e.className || '')),
s &&
((t.style.marginLeft = -s.x + 'px'),
(t.style.marginTop = -s.y + 'px')),
- o && ((t.style.width = o.x + 'px'), (t.style.height = o.y + 'px'));
+ o && ((t.style.width = o.x + 'px'), (t.style.height = o.y + 'px')));
},
_createImg: function (t, i) {
- return (i = i || document.createElement('img')), (i.src = t), i;
+ return ((i = i || document.createElement('img')), (i.src = t), i);
},
_getIconUrl: function (t) {
return (Yi && this.options[t + 'RetinaUrl']) || this.options[t + 'Url'];
@@ -3662,7 +3691,7 @@
},
addHooks: function () {
var t = this._marker._icon;
- this._draggable || (this._draggable = new Re(t, t, !0)),
+ (this._draggable || (this._draggable = new Re(t, t, !0)),
this._draggable
.on(
{
@@ -3674,10 +3703,10 @@
this
)
.enable(),
- Q(t, 'leaflet-marker-draggable');
+ Q(t, 'leaflet-marker-draggable'));
},
removeHooks: function () {
- this._draggable
+ (this._draggable
.off(
{
dragstart: this._onDragStart,
@@ -3689,7 +3718,7 @@
)
.disable(),
this._marker._icon &&
- tt(this._marker._icon, 'leaflet-marker-draggable');
+ tt(this._marker._icon, 'leaflet-marker-draggable'));
},
moved: function () {
return this._draggable && this._draggable._moved;
@@ -3710,17 +3739,17 @@
(Math.max(h.max.y, s.y) - h.max.y) / (r.max.y - h.max.y) -
(Math.min(h.min.y, s.y) - h.min.y) / (r.min.y - h.min.y)
).multiplyBy(n);
- e.panBy(u, { animate: !1 }),
+ (e.panBy(u, { animate: !1 }),
this._draggable._newPos._add(u),
this._draggable._startPos._add(u),
at(i._icon, this._draggable._newPos),
this._onDrag(t),
- (this._panRequest = f(this._adjustPan.bind(this, t)));
+ (this._panRequest = f(this._adjustPan.bind(this, t))));
}
},
_onDragStart: function () {
- (this._oldLatLng = this._marker.getLatLng()),
- this._marker.closePopup().fire('movestart').fire('dragstart');
+ ((this._oldLatLng = this._marker.getLatLng()),
+ this._marker.closePopup().fire('movestart').fire('dragstart'));
},
_onPreDrag: function (t) {
this._marker.options.autoPan &&
@@ -3732,16 +3761,16 @@
e = i._shadow,
n = ht(i._icon),
o = i._map.layerPointToLatLng(n);
- e && at(e, n),
+ (e && at(e, n),
(i._latlng = o),
(t.latlng = o),
(t.oldLatLng = this._oldLatLng),
- i.fire('move', t).fire('drag', t);
+ i.fire('move', t).fire('drag', t));
},
_onDragEnd: function (t) {
- g(this._panRequest),
+ (g(this._panRequest),
delete this._oldLatLng,
- this._marker.fire('moveend').fire('dragend', t);
+ this._marker.fire('moveend').fire('dragend', t));
},
}),
$e = qe.extend({
@@ -3763,23 +3792,23 @@
autoPanSpeed: 10,
},
initialize: function (t, i) {
- l(this, i), (this._latlng = C(t));
+ (l(this, i), (this._latlng = C(t)));
},
onAdd: function (t) {
- (this._zoomAnimated =
+ ((this._zoomAnimated =
this._zoomAnimated && t.options.markerZoomAnimation),
this._zoomAnimated && t.on('zoomanim', this._animateZoom, this),
this._initIcon(),
- this.update();
+ this.update());
},
onRemove: function (t) {
- this.dragging &&
+ (this.dragging &&
this.dragging.enabled() &&
((this.options.draggable = !0), this.dragging.removeHooks()),
delete this.dragging,
this._zoomAnimated && t.off('zoomanim', this._animateZoom, this),
this._removeIcon(),
- this._removeShadow();
+ this._removeShadow());
},
getEvents: function () {
return { zoom: this.update, viewreset: this.update };
@@ -3796,7 +3825,7 @@
);
},
setZIndexOffset: function (t) {
- return (this.options.zIndexOffset = t), this.update();
+ return ((this.options.zIndexOffset = t), this.update());
},
setIcon: function (t) {
return (
@@ -3821,7 +3850,7 @@
i = 'leaflet-zoom-' + (this._zoomAnimated ? 'animated' : 'hide'),
e = t.icon.createIcon(this._icon),
n = !1;
- e !== this._icon &&
+ (e !== this._icon &&
(this._icon && this._removeIcon(),
(n = !0),
t.title && (e.title = t.title),
@@ -3833,35 +3862,35 @@
this.on({
mouseover: this._bringToFront,
mouseout: this._resetZIndex,
- });
+ }));
var o = t.icon.createShadow(this._shadow),
s = !1;
- o !== this._shadow && (this._removeShadow(), (s = !0)),
+ (o !== this._shadow && (this._removeShadow(), (s = !0)),
o && (Q(o, i), (o.alt = '')),
(this._shadow = o),
t.opacity < 1 && this._updateOpacity(),
n && this.getPane().appendChild(this._icon),
this._initInteraction(),
- o && s && this.getPane('shadowPane').appendChild(this._shadow);
+ o && s && this.getPane('shadowPane').appendChild(this._shadow));
},
_removeIcon: function () {
- this.options.riseOnHover &&
+ (this.options.riseOnHover &&
this.off({
mouseover: this._bringToFront,
mouseout: this._resetZIndex,
}),
K(this._icon),
this.removeInteractiveTarget(this._icon),
- (this._icon = null);
+ (this._icon = null));
},
_removeShadow: function () {
- this._shadow && K(this._shadow), (this._shadow = null);
+ (this._shadow && K(this._shadow), (this._shadow = null));
},
_setPos: function (t) {
- at(this._icon, t),
+ (at(this._icon, t),
this._shadow && at(this._shadow, t),
(this._zIndex = t.y + this.options.zIndexOffset),
- this._resetZIndex();
+ this._resetZIndex());
},
_updateZIndex: function (t) {
this._icon.style.zIndex = this._zIndex + t;
@@ -3880,20 +3909,22 @@
Je)
) {
var t = this.options.draggable;
- this.dragging &&
+ (this.dragging &&
((t = this.dragging.enabled()), this.dragging.disable()),
(this.dragging = new Je(this)),
- t && this.dragging.enable();
+ t && this.dragging.enable());
}
},
setOpacity: function (t) {
return (
- (this.options.opacity = t), this._map && this._updateOpacity(), this
+ (this.options.opacity = t),
+ this._map && this._updateOpacity(),
+ this
);
},
_updateOpacity: function () {
var t = this.options.opacity;
- nt(this._icon, t), this._shadow && nt(this._shadow, t);
+ (nt(this._icon, t), this._shadow && nt(this._shadow, t));
},
_bringToFront: function () {
this._updateZIndex(this.options.riseOffset);
@@ -3929,32 +3960,34 @@
this._renderer = t.getRenderer(this);
},
onAdd: function () {
- this._renderer._initPath(this),
+ (this._renderer._initPath(this),
this._reset(),
- this._renderer._addPath(this);
+ this._renderer._addPath(this));
},
onRemove: function () {
this._renderer._removePath(this);
},
redraw: function () {
- return this._map && this._renderer._updatePath(this), this;
+ return (this._map && this._renderer._updatePath(this), this);
},
setStyle: function (t) {
return (
- l(this, t), this._renderer && this._renderer._updateStyle(this), this
+ l(this, t),
+ this._renderer && this._renderer._updateStyle(this),
+ this
);
},
bringToFront: function () {
- return this._renderer && this._renderer._bringToFront(this), this;
+ return (this._renderer && this._renderer._bringToFront(this), this);
},
bringToBack: function () {
- return this._renderer && this._renderer._bringToBack(this), this;
+ return (this._renderer && this._renderer._bringToBack(this), this);
},
getElement: function () {
return this._path;
},
_reset: function () {
- this._project(), this._update();
+ (this._project(), this._update());
},
_clickTolerance: function () {
return (
@@ -3966,7 +3999,9 @@
tn = Qe.extend({
options: { fill: !0, radius: 10 },
initialize: function (t, i) {
- l(this, i), (this._latlng = C(t)), (this._radius = this.options.radius);
+ (l(this, i),
+ (this._latlng = C(t)),
+ (this._radius = this.options.radius));
},
setLatLng: function (t) {
return (
@@ -3979,18 +4014,18 @@
return this._latlng;
},
setRadius: function (t) {
- return (this.options.radius = this._radius = t), this.redraw();
+ return ((this.options.radius = this._radius = t), this.redraw());
},
getRadius: function () {
return this._radius;
},
setStyle: function (t) {
var i = (t && t.radius) || this._radius;
- return Qe.prototype.setStyle.call(this, t), this.setRadius(i), this;
+ return (Qe.prototype.setStyle.call(this, t), this.setRadius(i), this);
},
_project: function () {
- (this._point = this._map.latLngToLayerPoint(this._latlng)),
- this._updateBounds();
+ ((this._point = this._map.latLngToLayerPoint(this._latlng)),
+ this._updateBounds());
},
_updateBounds: function () {
var t = this._radius,
@@ -4028,7 +4063,7 @@
this._mRadius = this.options.radius;
},
setRadius: function (t) {
- return (this._mRadius = t), this.redraw();
+ return ((this._mRadius = t), this.redraw());
},
getRadius: function () {
return this._mRadius;
@@ -4058,16 +4093,16 @@
(Math.cos(s * o) - Math.sin(i * o) * Math.sin(u * o)) /
(Math.cos(i * o) * Math.cos(u * o))
) / o;
- (isNaN(l) || 0 === l) && (l = s / Math.cos((Math.PI / 180) * i)),
+ ((isNaN(l) || 0 === l) && (l = s / Math.cos((Math.PI / 180) * i)),
(this._point = h.subtract(e.getPixelOrigin())),
(this._radius = isNaN(l) ? 0 : h.x - e.project([u, t - l]).x),
- (this._radiusY = h.y - r.y);
+ (this._radiusY = h.y - r.y));
} else {
var c = n.unproject(
n.project(this._latlng).subtract([this._mRadius, 0])
);
- (this._point = e.latLngToLayerPoint(this._latlng)),
- (this._radius = this._point.x - e.latLngToLayerPoint(c).x);
+ ((this._point = e.latLngToLayerPoint(this._latlng)),
+ (this._radius = this._point.x - e.latLngToLayerPoint(c).x));
}
this._updateBounds();
},
@@ -4075,13 +4110,13 @@
nn = Qe.extend({
options: { smoothFactor: 1, noClip: !1 },
initialize: function (t, i) {
- l(this, i), this._setLatLngs(t);
+ (l(this, i), this._setLatLngs(t));
},
getLatLngs: function () {
return this._latlngs;
},
setLatLngs: function (t) {
- return this._setLatLngs(t), this.redraw();
+ return (this._setLatLngs(t), this.redraw());
},
isEmpty: function () {
return !this._latlngs.length;
@@ -4096,7 +4131,7 @@
var c = s(t, (i = h[u - 1]), (e = h[u]), !0);
c < n && ((n = c), (o = s(t, i, e)));
}
- return o && (o.distance = Math.sqrt(n)), o;
+ return (o && (o.distance = Math.sqrt(n)), o);
},
getCenter: function () {
if (!this._map)
@@ -4136,7 +4171,7 @@
);
},
_setLatLngs: function (t) {
- (this._bounds = new T()), (this._latlngs = this._convertLatLngs(t));
+ ((this._bounds = new T()), (this._latlngs = this._convertLatLngs(t)));
},
_defaultShape: function () {
return jt(this._latlngs) ? this._latlngs : this._latlngs[0];
@@ -4150,7 +4185,8 @@
},
_project: function () {
var t = new P();
- (this._rings = []), this._projectLatlngs(this._latlngs, this._rings, t);
+ ((this._rings = []),
+ this._projectLatlngs(this._latlngs, this._rings, t));
var i = this._clickTolerance(),
e = new x(i, i);
this._bounds.isValid() &&
@@ -4164,7 +4200,7 @@
r = t.length;
if (s) {
for (o = [], n = 0; n < r; n++)
- (o[n] = this._map.latLngToLayerPoint(t[n])), e.extend(o[n]);
+ ((o[n] = this._map.latLngToLayerPoint(t[n])), e.extend(o[n]));
i.push(o);
} else for (n = 0; n < r; n++) this._projectLatlngs(t[n], i, e);
},
@@ -4246,26 +4282,28 @@
l = u.length;
if (!l) return null;
for (s = r = a = 0, t = 0, i = l - 1; t < l; i = t++)
- (e = u[t]),
+ ((e = u[t]),
(n = u[i]),
(o = e.y * n.x - n.y * e.x),
(r += (e.x + n.x) * o),
(a += (e.y + n.y) * o),
- (s += 3 * o);
+ (s += 3 * o));
return (
- (h = 0 === s ? u[0] : [r / s, a / s]), this._map.layerPointToLatLng(h)
+ (h = 0 === s ? u[0] : [r / s, a / s]),
+ this._map.layerPointToLatLng(h)
);
},
_convertLatLngs: function (t) {
var i = nn.prototype._convertLatLngs.call(this, t),
e = i.length;
return (
- e >= 2 && i[0] instanceof M && i[0].equals(i[e - 1]) && i.pop(), i
+ e >= 2 && i[0] instanceof M && i[0].equals(i[e - 1]) && i.pop(),
+ i
);
},
_setLatLngs: function (t) {
- nn.prototype._setLatLngs.call(this, t),
- jt(this._latlngs) && (this._latlngs = [this._latlngs]);
+ (nn.prototype._setLatLngs.call(this, t),
+ jt(this._latlngs) && (this._latlngs = [this._latlngs]));
},
_defaultShape: function () {
return jt(this._latlngs[0]) ? this._latlngs[0] : this._latlngs[0][0];
@@ -4300,17 +4338,17 @@
if (!this._pxBounds || !this._pxBounds.contains(t)) return !1;
for (o = 0, a = this._parts.length; o < a; o++)
for (s = 0, r = (h = (i = this._parts[o]).length) - 1; s < h; r = s++)
- (e = i[s]),
+ ((e = i[s]),
(n = i[r]),
e.y > t.y != n.y > t.y &&
t.x < ((n.x - e.x) * (t.y - e.y)) / (n.y - e.y) + e.x &&
- (u = !u);
+ (u = !u));
return u || nn.prototype._containsPoint.call(this, t, !0);
},
}),
sn = Ke.extend({
initialize: function (t, i) {
- l(this, i), (this._layers = {}), t && this.addData(t);
+ (l(this, i), (this._layers = {}), t && this.addData(t));
},
addData: function (t) {
var i,
@@ -4350,8 +4388,8 @@
}, this);
},
_setLayerStyle: function (t, i) {
- 'function' == typeof i && (i = i(t.feature)),
- t.setStyle && t.setStyle(i);
+ ('function' == typeof i && (i = i(t.feature)),
+ t.setStyle && t.setStyle(i));
},
}),
rn = {
@@ -4362,7 +4400,7 @@
});
},
};
- $e.include(rn),
+ ($e.include(rn),
en.include(rn),
tn.include(rn),
nn.include({
@@ -4420,7 +4458,7 @@
: { type: 'FeatureCollection', features: n }
);
},
- });
+ }));
var an = Xt,
hn = qe.extend({
options: {
@@ -4433,48 +4471,51 @@
className: '',
},
initialize: function (t, i, e) {
- (this._url = t), (this._bounds = z(i)), l(this, e);
+ ((this._url = t), (this._bounds = z(i)), l(this, e));
},
onAdd: function () {
- this._image ||
+ (this._image ||
(this._initImage(),
this.options.opacity < 1 && this._updateOpacity()),
this.options.interactive &&
(Q(this._image, 'leaflet-interactive'),
this.addInteractiveTarget(this._image)),
this.getPane().appendChild(this._image),
- this._reset();
+ this._reset());
},
onRemove: function () {
- K(this._image),
- this.options.interactive && this.removeInteractiveTarget(this._image);
+ (K(this._image),
+ this.options.interactive &&
+ this.removeInteractiveTarget(this._image));
},
setOpacity: function (t) {
return (
- (this.options.opacity = t), this._image && this._updateOpacity(), this
+ (this.options.opacity = t),
+ this._image && this._updateOpacity(),
+ this
);
},
setStyle: function (t) {
- return t.opacity && this.setOpacity(t.opacity), this;
+ return (t.opacity && this.setOpacity(t.opacity), this);
},
bringToFront: function () {
- return this._map && X(this._image), this;
+ return (this._map && X(this._image), this);
},
bringToBack: function () {
- return this._map && J(this._image), this;
+ return (this._map && J(this._image), this);
},
setUrl: function (t) {
- return (this._url = t), this._image && (this._image.src = t), this;
+ return ((this._url = t), this._image && (this._image.src = t), this);
},
setBounds: function (t) {
- return (this._bounds = z(t)), this._map && this._reset(), this;
+ return ((this._bounds = z(t)), this._map && this._reset(), this);
},
getEvents: function () {
var t = { zoom: this._reset, viewreset: this._reset };
- return this._zoomAnimated && (t.zoomanim = this._animateZoom), t;
+ return (this._zoomAnimated && (t.zoomanim = this._animateZoom), t);
},
setZIndex: function (t) {
- return (this.options.zIndex = t), this._updateZIndex(), this;
+ return ((this.options.zIndex = t), this._updateZIndex(), this);
},
getBounds: function () {
return this._bounds;
@@ -4485,7 +4526,7 @@
_initImage: function () {
var t = 'IMG' === this._url.tagName,
i = (this._image = t ? this._url : G('img'));
- Q(i, 'leaflet-image-layer'),
+ (Q(i, 'leaflet-image-layer'),
this._zoomAnimated && Q(i, 'leaflet-zoom-animated'),
this.options.className && Q(i, this.options.className),
(i.onselectstart = r),
@@ -4498,7 +4539,7 @@
this.options.zIndex && this._updateZIndex(),
t
? (this._url = i.src)
- : ((i.src = this._url), (i.alt = this.options.alt));
+ : ((i.src = this._url), (i.alt = this.options.alt)));
},
_animateZoom: function (t) {
var i = this._map.getZoomScale(t.zoom),
@@ -4516,9 +4557,9 @@
this._map.latLngToLayerPoint(this._bounds.getSouthEast())
),
e = i.getSize();
- at(t, i.min),
+ (at(t, i.min),
(t.style.width = e.x + 'px'),
- (t.style.height = e.y + 'px');
+ (t.style.height = e.y + 'px'));
},
_updateOpacity: function () {
nt(this._image, this.options.opacity);
@@ -4556,12 +4597,12 @@
o.push(n[s].src);
this._url = n.length > 0 ? o : [i.src];
} else {
- oi(this._url) || (this._url = [this._url]),
+ (oi(this._url) || (this._url = [this._url]),
(i.autoplay = !!this.options.autoplay),
- (i.loop = !!this.options.loop);
+ (i.loop = !!this.options.loop));
for (var a = 0; a < this._url.length; a++) {
var h = G('source');
- (h.src = this._url[a]), i.appendChild(h);
+ ((h.src = this._url[a]), i.appendChild(h));
}
}
},
@@ -4569,17 +4610,17 @@
ln = qe.extend({
options: { offset: [0, 7], className: '', pane: 'popupPane' },
initialize: function (t, i) {
- l(this, t), (this._source = i);
+ (l(this, t), (this._source = i));
},
onAdd: function (t) {
- (this._zoomAnimated = t._zoomAnimated),
+ ((this._zoomAnimated = t._zoomAnimated),
this._container || this._initLayout(),
t._fadeAnimated && nt(this._container, 0),
clearTimeout(this._removeTimeout),
this.getPane().appendChild(this._container),
this.update(),
t._fadeAnimated && nt(this._container, 1),
- this.bringToFront();
+ this.bringToFront());
},
onRemove: function (t) {
t._fadeAnimated
@@ -4604,7 +4645,7 @@
return this._content;
},
setContent: function (t) {
- return (this._content = t), this.update(), this;
+ return ((this._content = t), this.update(), this);
},
getElement: function () {
return this._container;
@@ -4620,16 +4661,16 @@
},
getEvents: function () {
var t = { zoom: this._updatePosition, viewreset: this._updatePosition };
- return this._zoomAnimated && (t.zoomanim = this._animateZoom), t;
+ return (this._zoomAnimated && (t.zoomanim = this._animateZoom), t);
},
isOpen: function () {
return !!this._map && this._map.hasLayer(this);
},
bringToFront: function () {
- return this._map && X(this._container), this;
+ return (this._map && X(this._container), this);
},
bringToBack: function () {
- return this._map && J(this._container), this;
+ return (this._map && J(this._container), this);
},
_updateContent: function () {
if (this._content) {
@@ -4657,8 +4698,8 @@
var n = (this._containerBottom = -i.y),
o = (this._containerLeft =
-Math.round(this._containerWidth / 2) + i.x);
- (this._container.style.bottom = n + 'px'),
- (this._container.style.left = o + 'px');
+ ((this._container.style.bottom = n + 'px'),
+ (this._container.style.left = o + 'px'));
}
},
_getAnchor: function () {
@@ -4681,21 +4722,21 @@
className: '',
},
openOn: function (t) {
- return t.openPopup(this), this;
+ return (t.openPopup(this), this);
},
onAdd: function (t) {
- ln.prototype.onAdd.call(this, t),
+ (ln.prototype.onAdd.call(this, t),
t.fire('popupopen', { popup: this }),
this._source &&
(this._source.fire('popupopen', { popup: this }, !0),
- this._source instanceof Qe || this._source.on('preclick', yt));
+ this._source instanceof Qe || this._source.on('preclick', yt)));
},
onRemove: function (t) {
- ln.prototype.onRemove.call(this, t),
+ (ln.prototype.onRemove.call(this, t),
t.fire('popupclose', { popup: this }),
this._source &&
(this._source.fire('popupclose', { popup: this }, !0),
- this._source instanceof Qe || this._source.off('preclick', yt));
+ this._source instanceof Qe || this._source.off('preclick', yt)));
},
getEvents: function () {
var t = ln.prototype.getEvents.call(this);
@@ -4728,27 +4769,27 @@
this.options.closeButton)
) {
var n = (this._closeButton = G('a', t + '-close-button', i));
- (n.href = '#close'),
+ ((n.href = '#close'),
(n.innerHTML = '×'),
- mt(n, 'click', this._onCloseButtonClick, this);
+ mt(n, 'click', this._onCloseButtonClick, this));
}
},
_updateLayout: function () {
var t = this._contentNode,
i = t.style;
- (i.width = ''), (i.whiteSpace = 'nowrap');
+ ((i.width = ''), (i.whiteSpace = 'nowrap'));
var e = t.offsetWidth;
- (e = Math.min(e, this.options.maxWidth)),
+ ((e = Math.min(e, this.options.maxWidth)),
(e = Math.max(e, this.options.minWidth)),
(i.width = e + 1 + 'px'),
(i.whiteSpace = ''),
- (i.height = '');
+ (i.height = ''));
var n = t.offsetHeight,
o = this.options.maxHeight;
- o && n > o
+ (o && n > o
? ((i.height = o + 'px'), Q(t, 'leaflet-popup-scrolled'))
: tt(t, 'leaflet-popup-scrolled'),
- (this._containerWidth = this._container.offsetWidth);
+ (this._containerWidth = this._container.offsetWidth));
},
_animateZoom: function (t) {
var i = this._map._latLngToNewLayerPoint(
@@ -4779,15 +4820,15 @@
u = t.getSize(),
l = 0,
c = 0;
- s.x + n + h.x > u.x && (l = s.x + n - u.x + h.x),
+ (s.x + n + h.x > u.x && (l = s.x + n - u.x + h.x),
s.x - l - a.x < 0 && (l = s.x - a.x),
s.y + e + h.y > u.y && (c = s.y + e - u.y + h.y),
s.y - c - a.y < 0 && (c = s.y - a.y),
- (l || c) && t.fire('autopanstart').panBy([l, c]);
+ (l || c) && t.fire('autopanstart').panBy([l, c]));
}
},
_onCloseButtonClick: function (t) {
- this._close(), Lt(t);
+ (this._close(), Lt(t));
},
_getAnchor: function () {
return w(
@@ -4797,7 +4838,7 @@
);
},
});
- be.mergeOptions({ closePopupOnClick: !0 }),
+ (be.mergeOptions({ closePopupOnClick: !0 }),
be.include({
openPopup: function (t, i, e) {
return (
@@ -4869,7 +4910,7 @@
);
},
closePopup: function () {
- return this._popup && this._popup._close(), this;
+ return (this._popup && this._popup._close(), this);
},
togglePopup: function (t) {
return (
@@ -4882,7 +4923,7 @@
return !!this._popup && this._popup.isOpen();
},
setPopupContent: function (t) {
- return this._popup && this._popup.setContent(t), this;
+ return (this._popup && this._popup.setContent(t), this);
},
getPopup: function () {
return this._popup;
@@ -4904,7 +4945,7 @@
_onKeyPress: function (t) {
13 === t.originalEvent.keyCode && this._openPopup(t);
},
- });
+ }));
var _n = ln.extend({
options: {
pane: 'tooltipPane',
@@ -4916,20 +4957,21 @@
opacity: 0.9,
},
onAdd: function (t) {
- ln.prototype.onAdd.call(this, t),
+ (ln.prototype.onAdd.call(this, t),
this.setOpacity(this.options.opacity),
t.fire('tooltipopen', { tooltip: this }),
- this._source && this._source.fire('tooltipopen', { tooltip: this }, !0);
+ this._source &&
+ this._source.fire('tooltipopen', { tooltip: this }, !0));
},
onRemove: function (t) {
- ln.prototype.onRemove.call(this, t),
+ (ln.prototype.onRemove.call(this, t),
t.fire('tooltipclose', { tooltip: this }),
this._source &&
- this._source.fire('tooltipclose', { tooltip: this }, !0);
+ this._source.fire('tooltipclose', { tooltip: this }, !0));
},
getEvents: function () {
var t = ln.prototype.getEvents.call(this);
- return qi && !this.options.permanent && (t.preclick = this._close), t;
+ return (qi && !this.options.permanent && (t.preclick = this._close), t);
},
_close: function () {
this._map && this._map.closeTooltip(this);
@@ -4954,7 +4996,7 @@
a = e.offsetHeight,
h = w(this.options.offset),
u = this._getAnchor();
- 'top' === s
+ ('top' === s
? (t = t.add(w(-r / 2 + h.x, -a + h.y + u.y, !0)))
: 'bottom' === s
? (t = t.subtract(w(r / 2 - h.x, -h.y, !0)))
@@ -4970,14 +5012,14 @@
tt(e, 'leaflet-tooltip-top'),
tt(e, 'leaflet-tooltip-bottom'),
Q(e, 'leaflet-tooltip-' + s),
- at(e, t);
+ at(e, t));
},
_updatePosition: function () {
var t = this._map.latLngToLayerPoint(this._latlng);
this._setPosition(t);
},
setOpacity: function (t) {
- (this.options.opacity = t), this._container && nt(this._container, t);
+ ((this.options.opacity = t), this._container && nt(this._container, t));
},
_animateZoom: function (t) {
var i = this._map._latLngToNewLayerPoint(this._latlng, t.zoom, t.center);
@@ -4991,7 +5033,7 @@
);
},
});
- be.include({
+ (be.include({
openTooltip: function (t, i, e) {
return (
t instanceof _n || (t = new _n(e).setContent(t)),
@@ -5000,7 +5042,7 @@
);
},
closeTooltip: function (t) {
- return t && this.removeLayer(t), this;
+ return (t && this.removeLayer(t), this);
},
}),
qe.include({
@@ -5031,14 +5073,14 @@
if (t || !this._tooltipHandlersAdded) {
var i = t ? 'off' : 'on',
e = { remove: this.closeTooltip, move: this._moveTooltip };
- this._tooltip.options.permanent
+ (this._tooltip.options.permanent
? (e.add = this._openTooltip)
: ((e.mouseover = this._openTooltip),
(e.mouseout = this.closeTooltip),
this._tooltip.options.sticky && (e.mousemove = this._moveTooltip),
qi && (e.click = this._openTooltip)),
this[i](e),
- (this._tooltipHandlersAdded = !t);
+ (this._tooltipHandlersAdded = !t));
}
},
openTooltip: function (t, i) {
@@ -5083,7 +5125,7 @@
return this._tooltip.isOpen();
},
setTooltipContent: function (t) {
- return this._tooltip && this._tooltip.setContent(t), this;
+ return (this._tooltip && this._tooltip.setContent(t), this);
},
getTooltip: function () {
return this._tooltip;
@@ -5098,14 +5140,14 @@
var i,
e,
n = t.latlng;
- this._tooltip.options.sticky &&
+ (this._tooltip.options.sticky &&
t.originalEvent &&
((i = this._map.mouseEventToContainerPoint(t.originalEvent)),
(e = this._map.containerPointToLayerPoint(i)),
(n = this._map.layerPointToLatLng(e))),
- this._tooltip.setLatLng(n);
+ this._tooltip.setLatLng(n));
},
- });
+ }));
var dn = Ye.extend({
options: {
iconSize: [12, 12],
@@ -5120,7 +5162,7 @@
var n = w(e.bgPos);
i.style.backgroundPosition = -n.x + 'px ' + -n.y + 'px';
}
- return this._setIconStyles(i, 'icon'), i;
+ return (this._setIconStyles(i, 'icon'), i);
},
createShadow: function () {
return null;
@@ -5149,46 +5191,48 @@
l(this, t);
},
onAdd: function () {
- this._initContainer(),
+ (this._initContainer(),
(this._levels = {}),
(this._tiles = {}),
this._resetView(),
- this._update();
+ this._update());
},
beforeAdd: function (t) {
t._addZoomLimit(this);
},
onRemove: function (t) {
- this._removeAllTiles(),
+ (this._removeAllTiles(),
K(this._container),
t._removeZoomLimit(this),
(this._container = null),
- (this._tileZoom = void 0);
+ (this._tileZoom = void 0));
},
bringToFront: function () {
return (
- this._map && (X(this._container), this._setAutoZIndex(Math.max)), this
+ this._map && (X(this._container), this._setAutoZIndex(Math.max)),
+ this
);
},
bringToBack: function () {
return (
- this._map && (J(this._container), this._setAutoZIndex(Math.min)), this
+ this._map && (J(this._container), this._setAutoZIndex(Math.min)),
+ this
);
},
getContainer: function () {
return this._container;
},
setOpacity: function (t) {
- return (this.options.opacity = t), this._updateOpacity(), this;
+ return ((this.options.opacity = t), this._updateOpacity(), this);
},
setZIndex: function (t) {
- return (this.options.zIndex = t), this._updateZIndex(), this;
+ return ((this.options.zIndex = t), this._updateZIndex(), this);
},
isLoading: function () {
return this._loading;
},
redraw: function () {
- return this._map && (this._removeAllTiles(), this._update()), this;
+ return (this._map && (this._removeAllTiles(), this._update()), this);
},
getEvents: function () {
var t = {
@@ -5233,8 +5277,8 @@
o < s;
o++
)
- (i = e[o].style.zIndex),
- e[o] !== this._container && i && (n = t(n, +i));
+ ((i = e[o].style.zIndex),
+ e[o] !== this._container && i && (n = t(n, +i)));
isFinite(n) &&
((this.options.zIndex = n + t(-1, 1)), this._updateZIndex());
},
@@ -5248,17 +5292,17 @@
var o = this._tiles[n];
if (o.current && o.loaded) {
var s = Math.min(1, (t - o.loaded) / 200);
- nt(o.el, s),
+ (nt(o.el, s),
s < 1
? (i = !0)
: (o.active ? (e = !0) : this._onOpaqueTile(o),
- (o.active = !0));
+ (o.active = !0)));
}
}
- e && !this._noPrune && this._pruneTiles(),
+ (e && !this._noPrune && this._pruneTiles(),
i &&
(g(this._fadeFrame),
- (this._fadeFrame = f(this._updateOpacity, this)));
+ (this._fadeFrame = f(this._updateOpacity, this))));
}
},
_onOpaqueTile: r,
@@ -5337,8 +5381,10 @@
},
_invalidateAll: function () {
for (var t in this._levels)
- K(this._levels[t].el), this._onRemoveLevel(t), delete this._levels[t];
- this._removeAllTiles(), (this._tileZoom = void 0);
+ (K(this._levels[t].el),
+ this._onRemoveLevel(t),
+ delete this._levels[t]);
+ (this._removeAllTiles(), (this._tileZoom = void 0));
},
_retainParent: function (t, i, e, n) {
var o = Math.floor(t / 2),
@@ -5387,7 +5433,7 @@
(void 0 !== this.options.minZoom && o < this.options.minZoom)) &&
(o = void 0);
var s = this.options.updateWhenZooming && o !== this._tileZoom;
- (n && !s) ||
+ ((n && !s) ||
((this._tileZoom = o),
this._abortLoading && this._abortLoading(),
this._updateLevels(),
@@ -5395,7 +5441,7 @@
void 0 !== o && this._update(t),
e || this._pruneTiles(),
(this._noPrune = !!e)),
- this._setZoomTransforms(t, i);
+ this._setZoomTransforms(t, i));
},
_setZoomTransforms: function (t, i) {
for (var e in this._levels)
@@ -5415,7 +5461,7 @@
e = (this._tileSize = this.getTileSize()),
n = this._tileZoom,
o = this._map.getPixelWorldBounds(this._tileZoom);
- o && (this._globalTileRange = this._pxBoundsToTileRange(o)),
+ (o && (this._globalTileRange = this._pxBoundsToTileRange(o)),
(this._wrapX = i.wrapLng &&
!this.options.noWrap && [
Math.floor(t.project([0, i.wrapLng[0]], n).x / e.x),
@@ -5425,7 +5471,7 @@
!this.options.noWrap && [
Math.floor(t.project([i.wrapLat[0], 0], n).y / e.x),
Math.ceil(t.project([i.wrapLat[1], 0], n).y / e.y),
- ]);
+ ]));
},
_onMoveEnd: function () {
this._map && !this._map._animatingZoom && this._update();
@@ -5522,7 +5568,7 @@
_tileCoordsToBounds: function (t) {
var i = this._tileCoordsToNwSe(t),
e = new T(i[0], i[1]);
- return this.options.noWrap || (e = this._map.wrapLatLngBounds(e)), e;
+ return (this.options.noWrap || (e = this._map.wrapLatLngBounds(e)), e);
},
_tileCoordsToKey: function (t) {
return t.x + ':' + t.y + ':' + t.z;
@@ -5530,7 +5576,7 @@
_keyToTileCoords: function (t) {
var i = t.split(':'),
e = new x(+i[0], +i[1]);
- return (e.z = +i[2]), e;
+ return ((e.z = +i[2]), e);
},
_removeTile: function (t) {
var i = this._tiles[t];
@@ -5545,23 +5591,23 @@
_initTile: function (t) {
Q(t, 'leaflet-tile');
var i = this.getTileSize();
- (t.style.width = i.x + 'px'),
+ ((t.style.width = i.x + 'px'),
(t.style.height = i.y + 'px'),
(t.onselectstart = r),
(t.onmousemove = r),
Li && this.options.opacity < 1 && nt(t, this.options.opacity),
- zi && !Mi && (t.style.WebkitBackfaceVisibility = 'hidden');
+ zi && !Mi && (t.style.WebkitBackfaceVisibility = 'hidden'));
},
_addTile: function (t, i) {
var n = this._getTilePos(t),
o = this._tileCoordsToKey(t),
s = this.createTile(this._wrapCoords(t), e(this._tileReady, this, t));
- this._initTile(s),
+ (this._initTile(s),
this.createTile.length < 2 && f(e(this._tileReady, this, t, null, s)),
at(s, n),
(this._tiles[o] = { el: s, coords: t, current: !0 }),
i.appendChild(s),
- this.fire('tileloadstart', { tile: s, coords: t });
+ this.fire('tileloadstart', { tile: s, coords: t }));
},
_tileReady: function (t, i, n) {
i && this.fire('tileerror', { error: i, tile: n, coords: t });
@@ -5591,7 +5637,7 @@
this._wrapX ? s(t.x, this._wrapX) : t.x,
this._wrapY ? s(t.y, this._wrapY) : t.y
);
- return (i.z = t.z), i;
+ return ((i.z = t.z), i);
},
_pxBoundsToTileRange: function (t) {
var i = this.getTileSize();
@@ -5618,7 +5664,7 @@
crossOrigin: !1,
},
initialize: function (t, i) {
- (this._url = t),
+ ((this._url = t),
(i = l(this, i)).detectRetina &&
Yi &&
i.maxZoom > 0 &&
@@ -5629,10 +5675,10 @@
(i.minZoom = Math.max(0, i.minZoom))),
'string' == typeof i.subdomains &&
(i.subdomains = i.subdomains.split('')),
- zi || this.on('tileunload', this._onTileRemove);
+ zi || this.on('tileunload', this._onTileRemove));
},
setUrl: function (t, i) {
- return (this._url = t), i || this.redraw(), this;
+ return ((this._url = t), i || this.redraw(), this);
},
createTile: function (t, i) {
var n = document.createElement('img');
@@ -5658,7 +5704,7 @@
};
if (this._map && !this._map.options.crs.infinite) {
var n = this._globalTileRange.max.y - t.y;
- this.options.tms && (e.y = n), (e['-y'] = n);
+ (this.options.tms && (e.y = n), (e['-y'] = n));
}
return _(this._url, i(e, this.options));
},
@@ -5667,7 +5713,7 @@
},
_tileOnError: function (t, i, e) {
var n = this.options.errorTileUrl;
- n && i.getAttribute('src') !== n && (i.src = n), t(e, i);
+ (n && i.getAttribute('src') !== n && (i.src = n), t(e, i));
},
_onTileRemove: function (t) {
t.tile.onload = null;
@@ -5677,7 +5723,7 @@
i = this.options.maxZoom,
e = this.options.zoomReverse,
n = this.options.zoomOffset;
- return e && (t = i - t), t + n;
+ return (e && (t = i - t), t + n);
},
_getSubdomain: function (t) {
var i = Math.abs(t.x + t.y) % this.options.subdomains.length;
@@ -5721,13 +5767,14 @@
for (var o in e) o in this.options || (n[o] = e[o]);
var s = (e = l(this, e)).detectRetina && Yi ? 2 : 1,
r = this.getTileSize();
- (n.width = r.x * s), (n.height = r.y * s), (this.wmsParams = n);
+ ((n.width = r.x * s), (n.height = r.y * s), (this.wmsParams = n));
},
onAdd: function (t) {
- (this._crs = this.options.crs || t.options.crs),
- (this._wmsVersion = parseFloat(this.wmsParams.version));
+ ((this._crs = this.options.crs || t.options.crs),
+ (this._wmsVersion = parseFloat(this.wmsParams.version)));
var i = this._wmsVersion >= 1.3 ? 'crs' : 'srs';
- (this.wmsParams[i] = this._crs.code), mn.prototype.onAdd.call(this, t);
+ ((this.wmsParams[i] = this._crs.code),
+ mn.prototype.onAdd.call(this, t));
},
getTileUrl: function (t) {
var i = this._tileCoordsToNwSe(t),
@@ -5749,28 +5796,28 @@
);
},
setParams: function (t, e) {
- return i(this.wmsParams, t), e || this.redraw(), this;
+ return (i(this.wmsParams, t), e || this.redraw(), this);
},
});
- (mn.WMS = fn),
+ ((mn.WMS = fn),
(Jt.wms = function (t, i) {
return new fn(t, i);
- });
+ }));
var gn = qe.extend({
options: { padding: 0.1, tolerance: 0 },
initialize: function (t) {
- l(this, t), n(this), (this._layers = this._layers || {});
+ (l(this, t), n(this), (this._layers = this._layers || {}));
},
onAdd: function () {
- this._container ||
+ (this._container ||
(this._initContainer(),
this._zoomAnimated && Q(this._container, 'leaflet-zoom-animated')),
this.getPane().appendChild(this._container),
this._update(),
- this.on('update', this._updatePaths, this);
+ this.on('update', this._updatePaths, this));
},
onRemove: function () {
- this.off('update', this._updatePaths, this), this._destroyContainer();
+ (this.off('update', this._updatePaths, this), this._destroyContainer());
},
getEvents: function () {
var t = {
@@ -5779,7 +5826,7 @@
moveend: this._update,
zoomend: this._onZoomEnd,
};
- return this._zoomAnimated && (t.zoomanim = this._onAnimZoom), t;
+ return (this._zoomAnimated && (t.zoomanim = this._onAnimZoom), t);
},
_onAnimZoom: function (t) {
this._updateTransform(t.center, t.zoom);
@@ -5797,7 +5844,7 @@
ji ? rt(this._container, a, e) : at(this._container, a);
},
_reset: function () {
- this._update(), this._updateTransform(this._center, this._zoom);
+ (this._update(), this._updateTransform(this._center, this._zoom));
for (var t in this._layers) this._layers[t]._reset();
},
_onZoomEnd: function () {
@@ -5810,25 +5857,25 @@
var t = this.options.padding,
i = this._map.getSize(),
e = this._map.containerPointToLayerPoint(i.multiplyBy(-t)).round();
- (this._bounds = new P(e, e.add(i.multiplyBy(1 + 2 * t)).round())),
+ ((this._bounds = new P(e, e.add(i.multiplyBy(1 + 2 * t)).round())),
(this._center = this._map.getCenter()),
- (this._zoom = this._map.getZoom());
+ (this._zoom = this._map.getZoom()));
},
}),
vn = gn.extend({
getEvents: function () {
var t = gn.prototype.getEvents.call(this);
- return (t.viewprereset = this._onViewPreReset), t;
+ return ((t.viewprereset = this._onViewPreReset), t);
},
_onViewPreReset: function () {
this._postponeUpdatePaths = !0;
},
onAdd: function () {
- gn.prototype.onAdd.call(this), this._draw();
+ (gn.prototype.onAdd.call(this), this._draw());
},
_initContainer: function () {
var t = (this._container = document.createElement('canvas'));
- mt(t, 'mousemove', o(this._onMouseMove, 32, this), this),
+ (mt(t, 'mousemove', o(this._onMouseMove, 32, this), this),
mt(
t,
'click dblclick mousedown mouseup contextmenu',
@@ -5836,14 +5883,14 @@
this
),
mt(t, 'mouseout', this._handleMouseOut, this),
- (this._ctx = t.getContext('2d'));
+ (this._ctx = t.getContext('2d')));
},
_destroyContainer: function () {
- g(this._redrawRequest),
+ (g(this._redrawRequest),
delete this._ctx,
K(this._container),
ft(this._container),
- delete this._container;
+ delete this._container);
},
_updatePaths: function () {
if (!this._postponeUpdatePaths) {
@@ -5854,32 +5901,32 @@
},
_update: function () {
if (!this._map._animatingZoom || !this._bounds) {
- (this._drawnLayers = {}), gn.prototype._update.call(this);
+ ((this._drawnLayers = {}), gn.prototype._update.call(this));
var t = this._bounds,
i = this._container,
e = t.getSize(),
n = Yi ? 2 : 1;
- at(i, t.min),
+ (at(i, t.min),
(i.width = n * e.x),
(i.height = n * e.y),
(i.style.width = e.x + 'px'),
(i.style.height = e.y + 'px'),
Yi && this._ctx.scale(2, 2),
this._ctx.translate(-t.min.x, -t.min.y),
- this.fire('update');
+ this.fire('update'));
}
},
_reset: function () {
- gn.prototype._reset.call(this),
+ (gn.prototype._reset.call(this),
this._postponeUpdatePaths &&
- ((this._postponeUpdatePaths = !1), this._updatePaths());
+ ((this._postponeUpdatePaths = !1), this._updatePaths()));
},
_initPath: function (t) {
- this._updateDashArray(t), (this._layers[n(t)] = t);
+ (this._updateDashArray(t), (this._layers[n(t)] = t));
var i = (t._order = { layer: t, prev: this._drawLast, next: null });
- this._drawLast && (this._drawLast.next = i),
+ (this._drawLast && (this._drawLast.next = i),
(this._drawLast = i),
- (this._drawFirst = this._drawFirst || this._drawLast);
+ (this._drawFirst = this._drawFirst || this._drawLast));
},
_addPath: function (t) {
this._requestRedraw(t);
@@ -5888,21 +5935,21 @@
var i = t._order,
e = i.next,
o = i.prev;
- e ? (e.prev = o) : (this._drawLast = o),
+ (e ? (e.prev = o) : (this._drawLast = o),
o ? (o.next = e) : (this._drawFirst = e),
delete this._drawnLayers[t._leaflet_id],
delete t._order,
delete this._layers[n(t)],
- this._requestRedraw(t);
+ this._requestRedraw(t));
},
_updatePath: function (t) {
- this._extendRedrawBounds(t),
+ (this._extendRedrawBounds(t),
t._project(),
t._update(),
- this._requestRedraw(t);
+ this._requestRedraw(t));
},
_updateStyle: function (t) {
- this._updateDashArray(t), this._requestRedraw(t);
+ (this._updateDashArray(t), this._requestRedraw(t));
},
_updateDashArray: function (t) {
if ('string' == typeof t.options.dashArray) {
@@ -5921,18 +5968,18 @@
_extendRedrawBounds: function (t) {
if (t._pxBounds) {
var i = (t.options.weight || 0) + 1;
- (this._redrawBounds = this._redrawBounds || new P()),
+ ((this._redrawBounds = this._redrawBounds || new P()),
this._redrawBounds.extend(t._pxBounds.min.subtract([i, i])),
- this._redrawBounds.extend(t._pxBounds.max.add([i, i]));
+ this._redrawBounds.extend(t._pxBounds.max.add([i, i])));
}
},
_redraw: function () {
- (this._redrawRequest = null),
+ ((this._redrawRequest = null),
this._redrawBounds &&
(this._redrawBounds.min._floor(), this._redrawBounds.max._ceil()),
this._clear(),
this._draw(),
- (this._redrawBounds = null);
+ (this._redrawBounds = null));
},
_clear: function () {
var t = this._redrawBounds;
@@ -5952,16 +5999,16 @@
i = this._redrawBounds;
if ((this._ctx.save(), i)) {
var e = i.getSize();
- this._ctx.beginPath(),
+ (this._ctx.beginPath(),
this._ctx.rect(i.min.x, i.min.y, e.x, e.y),
- this._ctx.clip();
+ this._ctx.clip());
}
this._drawing = !0;
for (var n = this._drawFirst; n; n = n.next)
- (t = n.layer),
+ ((t = n.layer),
(!i || (t._pxBounds && t._pxBounds.intersects(i))) &&
- t._updatePath();
- (this._drawing = !1), this._ctx.restore();
+ t._updatePath());
+ ((this._drawing = !1), this._ctx.restore());
},
_updatePoly: function (t, i) {
if (this._drawing) {
@@ -5979,7 +6026,7 @@
e++
) {
for (n = 0, o = r[e].length; n < o; n++)
- (s = r[e][n]), h[n ? 'lineTo' : 'moveTo'](s.x, s.y);
+ ((s = r[e][n]), h[n ? 'lineTo' : 'moveTo'](s.x, s.y));
i && h.closePath();
}
this._fillStroke(h, t);
@@ -5992,17 +6039,17 @@
e = this._ctx,
n = Math.max(Math.round(t._radius), 1),
o = (Math.max(Math.round(t._radiusY), 1) || n) / n;
- (this._drawnLayers[t._leaflet_id] = t),
+ ((this._drawnLayers[t._leaflet_id] = t),
1 !== o && (e.save(), e.scale(1, o)),
e.beginPath(),
e.arc(i.x, i.y / o, n, 0, 2 * Math.PI, !1),
1 !== o && e.restore(),
- this._fillStroke(e, t);
+ this._fillStroke(e, t));
}
},
_fillStroke: function (t, i) {
var e = i.options;
- e.fill &&
+ (e.fill &&
((t.globalAlpha = e.fillOpacity),
(t.fillStyle = e.fillColor || e.color),
t.fill(e.fillRule || 'evenodd')),
@@ -6015,7 +6062,7 @@
(t.strokeStyle = e.color),
(t.lineCap = e.lineCap),
(t.lineJoin = e.lineJoin),
- t.stroke());
+ t.stroke()));
},
_onClick: function (t) {
for (
@@ -6052,13 +6099,13 @@
_handleMouseHover: function (t, i) {
for (var e, n, o = this._drawFirst; o; o = o.next)
(e = o.layer).options.interactive && e._containsPoint(i) && (n = e);
- n !== this._hoveredLayer &&
+ (n !== this._hoveredLayer &&
(this._handleMouseOut(t),
n &&
(Q(this._container, 'leaflet-interactive'),
this._fireEvent([n], t, 'mouseover'),
(this._hoveredLayer = n))),
- this._hoveredLayer && this._fireEvent([this._hoveredLayer], t);
+ this._hoveredLayer && this._fireEvent([this._hoveredLayer], t));
},
_fireEvent: function (t, i, e) {
this._map._fireDOMEvent(i, e || i.type, t);
@@ -6116,28 +6163,28 @@
},
_initPath: function (t) {
var i = (t._container = yn('shape'));
- Q(i, 'leaflet-vml-shape ' + (this.options.className || '')),
+ (Q(i, 'leaflet-vml-shape ' + (this.options.className || '')),
(i.coordsize = '1 1'),
(t._path = yn('path')),
i.appendChild(t._path),
this._updateStyle(t),
- (this._layers[n(t)] = t);
+ (this._layers[n(t)] = t));
},
_addPath: function (t) {
var i = t._container;
- this._container.appendChild(i),
- t.options.interactive && t.addInteractiveTarget(i);
+ (this._container.appendChild(i),
+ t.options.interactive && t.addInteractiveTarget(i));
},
_removePath: function (t) {
var i = t._container;
- K(i), t.removeInteractiveTarget(i), delete this._layers[n(t)];
+ (K(i), t.removeInteractiveTarget(i), delete this._layers[n(t)]);
},
_updateStyle: function (t) {
var i = t._stroke,
e = t._fill,
n = t.options,
o = t._container;
- (o.stroked = !!n.stroke),
+ ((o.stroked = !!n.stroke),
(o.filled = !!n.fill),
n.stroke
? (i || (i = t._stroke = yn('stroke')),
@@ -6158,7 +6205,7 @@
o.appendChild(e),
(e.color = n.fillColor || n.color),
(e.opacity = n.fillOpacity))
- : e && (o.removeChild(e), (t._fill = null));
+ : e && (o.removeChild(e), (t._fill = null)));
},
_updateCircle: function (t) {
var i = t._point.round(),
@@ -6185,20 +6232,20 @@
Pn = gn.extend({
getEvents: function () {
var t = gn.prototype.getEvents.call(this);
- return (t.zoomstart = this._onZoomStart), t;
+ return ((t.zoomstart = this._onZoomStart), t);
},
_initContainer: function () {
- (this._container = wn('svg')),
+ ((this._container = wn('svg')),
this._container.setAttribute('pointer-events', 'none'),
(this._rootGroup = wn('g')),
- this._container.appendChild(this._rootGroup);
+ this._container.appendChild(this._rootGroup));
},
_destroyContainer: function () {
- K(this._container),
+ (K(this._container),
ft(this._container),
delete this._container,
delete this._rootGroup,
- delete this._svgSize;
+ delete this._svgSize);
},
_onZoomStart: function () {
this._update();
@@ -6209,34 +6256,34 @@
var t = this._bounds,
i = t.getSize(),
e = this._container;
- (this._svgSize && this._svgSize.equals(i)) ||
+ ((this._svgSize && this._svgSize.equals(i)) ||
((this._svgSize = i),
e.setAttribute('width', i.x),
e.setAttribute('height', i.y)),
at(e, t.min),
e.setAttribute('viewBox', [t.min.x, t.min.y, i.x, i.y].join(' ')),
- this.fire('update');
+ this.fire('update'));
}
},
_initPath: function (t) {
var i = (t._path = wn('path'));
- t.options.className && Q(i, t.options.className),
+ (t.options.className && Q(i, t.options.className),
t.options.interactive && Q(i, 'leaflet-interactive'),
this._updateStyle(t),
- (this._layers[n(t)] = t);
+ (this._layers[n(t)] = t));
},
_addPath: function (t) {
- this._rootGroup || this._initContainer(),
+ (this._rootGroup || this._initContainer(),
this._rootGroup.appendChild(t._path),
- t.addInteractiveTarget(t._path);
+ t.addInteractiveTarget(t._path));
},
_removePath: function (t) {
- K(t._path),
+ (K(t._path),
t.removeInteractiveTarget(t._path),
- delete this._layers[n(t)];
+ delete this._layers[n(t)]);
},
_updatePath: function (t) {
- t._project(), t._update();
+ (t._project(), t._update());
},
_updateStyle: function (t) {
var i = t._path,
@@ -6297,7 +6344,7 @@
J(t._path);
},
});
- $i && Pn.include(xn),
+ ($i && Pn.include(xn),
be.include({
getRenderer: function (t) {
var i =
@@ -6324,7 +6371,7 @@
_createRenderer: function (t) {
return (this.options.preferCanvas && $t(t)) || Qt(t);
},
- });
+ }));
var Ln = on.extend({
initialize: function (t, i) {
on.prototype.initialize.call(this, this._boundsToLatLngs(t), i);
@@ -6339,7 +6386,7 @@
);
},
});
- (Pn.create = wn),
+ ((Pn.create = wn),
(Pn.pointsToPath = k),
(sn.geometryToLayer = Ft),
(sn.coordsToLatLng = Ut),
@@ -6348,14 +6395,14 @@
(sn.latLngsToCoords = Gt),
(sn.getFeature = Kt),
(sn.asFeature = Yt),
- be.mergeOptions({ boxZoom: !0 });
+ be.mergeOptions({ boxZoom: !0 }));
var bn = Ee.extend({
initialize: function (t) {
- (this._map = t),
+ ((this._map = t),
(this._container = t._container),
(this._pane = t._panes.overlayPane),
(this._resetStateTimeout = 0),
- t.on('unload', this._destroy, this);
+ t.on('unload', this._destroy, this));
},
addHooks: function () {
mt(this._container, 'mousedown', this._onMouseDown, this);
@@ -6367,10 +6414,10 @@
return this._moved;
},
_destroy: function () {
- K(this._pane), delete this._pane;
+ (K(this._pane), delete this._pane);
},
_resetState: function () {
- (this._resetStateTimeout = 0), (this._moved = !1);
+ ((this._resetStateTimeout = 0), (this._moved = !1));
},
_clearDeferredResetState: function () {
0 !== this._resetStateTimeout &&
@@ -6378,7 +6425,7 @@
},
_onMouseDown: function (t) {
if (!t.shiftKey || (1 !== t.which && 1 !== t.button)) return !1;
- this._clearDeferredResetState(),
+ (this._clearDeferredResetState(),
this._resetState(),
fi(),
ut(),
@@ -6392,23 +6439,23 @@
keydown: this._onKeyDown,
},
this
- );
+ ));
},
_onMouseMove: function (t) {
- this._moved ||
+ (this._moved ||
((this._moved = !0),
(this._box = G('div', 'leaflet-zoom-box', this._container)),
Q(this._container, 'leaflet-crosshair'),
this._map.fire('boxzoomstart')),
- (this._point = this._map.mouseEventToContainerPoint(t));
+ (this._point = this._map.mouseEventToContainerPoint(t)));
var i = new P(this._point, this._startPoint),
e = i.getSize();
- at(this._box, i.min),
+ (at(this._box, i.min),
(this._box.style.width = e.x + 'px'),
- (this._box.style.height = e.y + 'px');
+ (this._box.style.height = e.y + 'px'));
},
_finish: function () {
- this._moved && (K(this._box), tt(this._container, 'leaflet-crosshair')),
+ (this._moved && (K(this._box), tt(this._container, 'leaflet-crosshair')),
gi(),
lt(),
ft(
@@ -6420,12 +6467,12 @@
keydown: this._onKeyDown,
},
this
- );
+ ));
},
_onMouseUp: function (t) {
if ((1 === t.which || 1 === t.button) && (this._finish(), this._moved)) {
- this._clearDeferredResetState(),
- (this._resetStateTimeout = setTimeout(e(this._resetState, this), 0));
+ (this._clearDeferredResetState(),
+ (this._resetStateTimeout = setTimeout(e(this._resetState, this), 0)));
var i = new T(
this._map.containerPointToLatLng(this._startPoint),
this._map.containerPointToLatLng(this._point)
@@ -6437,8 +6484,8 @@
27 === t.keyCode && this._finish();
},
});
- be.addInitHook('addHandler', 'boxZoom', bn),
- be.mergeOptions({ doubleClickZoom: !0 });
+ (be.addInitHook('addHandler', 'boxZoom', bn),
+ be.mergeOptions({ doubleClickZoom: !0 }));
var Tn = Ee.extend({
addHooks: function () {
this._map.on('dblclick', this._onDoubleClick, this);
@@ -6456,7 +6503,7 @@
: i.setZoomAround(t.containerPoint, o);
},
});
- be.addInitHook('addHandler', 'doubleClickZoom', Tn),
+ (be.addInitHook('addHandler', 'doubleClickZoom', Tn),
be.mergeOptions({
dragging: !0,
inertia: !Mi,
@@ -6465,12 +6512,12 @@
easeLinearity: 0.2,
worldCopyJump: !1,
maxBoundsViscosity: 0,
- });
+ }));
var zn = Ee.extend({
addHooks: function () {
if (!this._draggable) {
var t = this._map;
- (this._draggable = new Re(t._mapPane, t._container)),
+ ((this._draggable = new Re(t._mapPane, t._container)),
this._draggable.on(
{
dragstart: this._onDragStart,
@@ -6483,17 +6530,17 @@
t.options.worldCopyJump &&
(this._draggable.on('predrag', this._onPreDragWrap, this),
t.on('zoomend', this._onZoomEnd, this),
- t.whenReady(this._onZoomEnd, this));
+ t.whenReady(this._onZoomEnd, this)));
}
- Q(this._map._container, 'leaflet-grab leaflet-touch-drag'),
+ (Q(this._map._container, 'leaflet-grab leaflet-touch-drag'),
this._draggable.enable(),
(this._positions = []),
- (this._times = []);
+ (this._times = []));
},
removeHooks: function () {
- tt(this._map._container, 'leaflet-grab'),
+ (tt(this._map._container, 'leaflet-grab'),
tt(this._map._container, 'leaflet-touch-drag'),
- this._draggable.disable();
+ this._draggable.disable());
},
moved: function () {
return this._draggable && this._draggable._moved;
@@ -6508,7 +6555,7 @@
this._map.options.maxBounds && this._map.options.maxBoundsViscosity)
) {
var i = z(this._map.options.maxBounds);
- (this._offsetLimit = b(
+ ((this._offsetLimit = b(
this._map.latLngToContainerPoint(i.getNorthWest()).multiplyBy(-1),
this._map
.latLngToContainerPoint(i.getSouthEast())
@@ -6518,29 +6565,29 @@
(this._viscosity = Math.min(
1,
Math.max(0, this._map.options.maxBoundsViscosity)
- ));
+ )));
} else this._offsetLimit = null;
- t.fire('movestart').fire('dragstart'),
- t.options.inertia && ((this._positions = []), (this._times = []));
+ (t.fire('movestart').fire('dragstart'),
+ t.options.inertia && ((this._positions = []), (this._times = [])));
},
_onDrag: function (t) {
if (this._map.options.inertia) {
var i = (this._lastTime = +new Date()),
e = (this._lastPos =
this._draggable._absPos || this._draggable._newPos);
- this._positions.push(e), this._times.push(i), this._prunePositions(i);
+ (this._positions.push(e), this._times.push(i), this._prunePositions(i));
}
this._map.fire('move', t).fire('drag', t);
},
_prunePositions: function (t) {
for (; this._positions.length > 1 && t - this._times[0] > 50; )
- this._positions.shift(), this._times.shift();
+ (this._positions.shift(), this._times.shift());
},
_onZoomEnd: function () {
var t = this._map.getSize().divideBy(2),
i = this._map.latLngToLayerPoint([0, 0]);
- (this._initialWorldOffset = i.subtract(t).x),
- (this._worldWidth = this._map.getPixelWorldBounds().getSize().x);
+ ((this._initialWorldOffset = i.subtract(t).x),
+ (this._worldWidth = this._map.getPixelWorldBounds().getSize().x));
},
_viscousLimit: function (t, i) {
return t - (t - i) * this._viscosity;
@@ -6549,11 +6596,11 @@
if (this._viscosity && this._offsetLimit) {
var t = this._draggable._newPos.subtract(this._draggable._startPos),
i = this._offsetLimit;
- t.x < i.min.x && (t.x = this._viscousLimit(t.x, i.min.x)),
+ (t.x < i.min.x && (t.x = this._viscousLimit(t.x, i.min.x)),
t.y < i.min.y && (t.y = this._viscousLimit(t.y, i.min.y)),
t.x > i.max.x && (t.x = this._viscousLimit(t.x, i.max.x)),
t.y > i.max.y && (t.y = this._viscousLimit(t.y, i.max.y)),
- (this._draggable._newPos = this._draggable._startPos.add(t));
+ (this._draggable._newPos = this._draggable._startPos.add(t)));
}
},
_onPreDragWrap: function () {
@@ -6564,8 +6611,8 @@
o = ((n - i + e) % t) + i - e,
s = ((n + i + e) % t) - i - e,
r = Math.abs(o + e) < Math.abs(s + e) ? o : s;
- (this._draggable._absPos = this._draggable._newPos.clone()),
- (this._draggable._newPos.x = r);
+ ((this._draggable._absPos = this._draggable._newPos.clone()),
+ (this._draggable._newPos.x = r));
},
_onDragEnd: function (t) {
var i = this._map,
@@ -6597,8 +6644,8 @@
}
},
});
- be.addInitHook('addHandler', 'dragging', zn),
- be.mergeOptions({ keyboard: !0, keyboardPanDelta: 80 });
+ (be.addInitHook('addHandler', 'dragging', zn),
+ be.mergeOptions({ keyboard: !0, keyboardPanDelta: 80 }));
var Mn = Ee.extend({
keyCodes: {
left: [37],
@@ -6609,13 +6656,13 @@
zoomOut: [189, 109, 54, 173],
},
initialize: function (t) {
- (this._map = t),
+ ((this._map = t),
this._setPanDelta(t.options.keyboardPanDelta),
- this._setZoomDelta(t.options.zoomDelta);
+ this._setZoomDelta(t.options.zoomDelta));
},
addHooks: function () {
var t = this._map._container;
- t.tabIndex <= 0 && (t.tabIndex = '0'),
+ (t.tabIndex <= 0 && (t.tabIndex = '0'),
mt(
t,
{
@@ -6625,10 +6672,10 @@
},
this
),
- this._map.on({ focus: this._addHooks, blur: this._removeHooks }, this);
+ this._map.on({ focus: this._addHooks, blur: this._removeHooks }, this));
},
removeHooks: function () {
- this._removeHooks(),
+ (this._removeHooks(),
ft(
this._map._container,
{
@@ -6638,7 +6685,10 @@
},
this
),
- this._map.off({ focus: this._addHooks, blur: this._removeHooks }, this);
+ this._map.off(
+ { focus: this._addHooks, blur: this._removeHooks },
+ this
+ ));
},
_onMouseDown: function () {
if (!this._focused) {
@@ -6646,14 +6696,14 @@
i = document.documentElement,
e = t.scrollTop || i.scrollTop,
n = t.scrollLeft || i.scrollLeft;
- this._map._container.focus(), window.scrollTo(n, e);
+ (this._map._container.focus(), window.scrollTo(n, e));
}
},
_onFocus: function () {
- (this._focused = !0), this._map.fire('focus');
+ ((this._focused = !0), this._map.fire('focus'));
},
_onBlur: function () {
- (this._focused = !1), this._map.fire('blur');
+ ((this._focused = !1), this._map.fire('blur'));
},
_setPanDelta: function (t) {
var i,
@@ -6701,16 +6751,16 @@
}
},
});
- be.addInitHook('addHandler', 'keyboard', Mn),
+ (be.addInitHook('addHandler', 'keyboard', Mn),
be.mergeOptions({
scrollWheelZoom: !0,
wheelDebounceTime: 40,
wheelPxPerZoomLevel: 60,
- });
+ }));
var Cn = Ee.extend({
addHooks: function () {
- mt(this._map._container, 'mousewheel', this._onWheelScroll, this),
- (this._delta = 0);
+ (mt(this._map._container, 'mousewheel', this._onWheelScroll, this),
+ (this._delta = 0));
},
removeHooks: function () {
ft(this._map._container, 'mousewheel', this._onWheelScroll, this);
@@ -6718,13 +6768,13 @@
_onWheelScroll: function (t) {
var i = Tt(t),
n = this._map.options.wheelDebounceTime;
- (this._delta += i),
+ ((this._delta += i),
(this._lastMousePos = this._map.mouseEventToContainerPoint(t)),
- this._startTime || (this._startTime = +new Date());
+ this._startTime || (this._startTime = +new Date()));
var o = Math.max(n - (+new Date() - this._startTime), 0);
- clearTimeout(this._timer),
+ (clearTimeout(this._timer),
(this._timer = setTimeout(e(this._performZoom, this), o)),
- Lt(t);
+ Lt(t));
},
_performZoom: function () {
var t = this._map,
@@ -6735,16 +6785,16 @@
o = (4 * Math.log(2 / (1 + Math.exp(-Math.abs(n))))) / Math.LN2,
s = e ? Math.ceil(o / e) * e : o,
r = t._limitZoom(i + (this._delta > 0 ? s : -s)) - i;
- (this._delta = 0),
+ ((this._delta = 0),
(this._startTime = null),
r &&
('center' === t.options.scrollWheelZoom
? t.setZoom(i + r)
- : t.setZoomAround(this._lastMousePos, i + r));
+ : t.setZoomAround(this._lastMousePos, i + r)));
},
});
- be.addInitHook('addHandler', 'scrollWheelZoom', Cn),
- be.mergeOptions({ tap: !0, tapTolerance: 15 });
+ (be.addInitHook('addHandler', 'scrollWheelZoom', Cn),
+ be.mergeOptions({ tap: !0, tapTolerance: 15 }));
var Sn = Ee.extend({
addHooks: function () {
mt(this._map._container, 'touchstart', this._onDown, this);
@@ -6755,10 +6805,10 @@
_onDown: function (t) {
if (t.touches) {
if ((Pt(t), (this._fireClick = !0), t.touches.length > 1))
- return (this._fireClick = !1), void clearTimeout(this._holdTimeout);
+ return ((this._fireClick = !1), void clearTimeout(this._holdTimeout));
var i = t.touches[0],
n = i.target;
- (this._startPos = this._newPos = new x(i.clientX, i.clientY)),
+ ((this._startPos = this._newPos = new x(i.clientX, i.clientY)),
n.tagName &&
'a' === n.tagName.toLowerCase() &&
Q(n, 'leaflet-active'),
@@ -6772,7 +6822,11 @@
1e3
)),
this._simulateEvent('mousedown', i),
- mt(document, { touchmove: this._onMove, touchend: this._onUp }, this);
+ mt(
+ document,
+ { touchmove: this._onMove, touchend: this._onUp },
+ this
+ ));
}
},
_onUp: function (t) {
@@ -6783,12 +6837,12 @@
) {
var i = t.changedTouches[0],
e = i.target;
- e &&
+ (e &&
e.tagName &&
'a' === e.tagName.toLowerCase() &&
tt(e, 'leaflet-active'),
this._simulateEvent('mouseup', i),
- this._isTapValid() && this._simulateEvent('click', i);
+ this._isTapValid() && this._simulateEvent('click', i));
}
},
_isTapValid: function () {
@@ -6799,12 +6853,12 @@
},
_onMove: function (t) {
var i = t.touches[0];
- (this._newPos = new x(i.clientX, i.clientY)),
- this._simulateEvent('mousemove', i);
+ ((this._newPos = new x(i.clientX, i.clientY)),
+ this._simulateEvent('mousemove', i));
},
_simulateEvent: function (t, i) {
var e = document.createEvent('MouseEvents');
- (e._simulated = !0),
+ ((e._simulated = !0),
(i.target._simulatedClick = !0),
e.initMouseEvent(
t,
@@ -6823,19 +6877,19 @@
0,
null
),
- i.target.dispatchEvent(e);
+ i.target.dispatchEvent(e));
},
});
- qi && !Vi && be.addInitHook('addHandler', 'tap', Sn),
- be.mergeOptions({ touchZoom: qi && !Mi, bounceAtZoomLimits: !0 });
+ (qi && !Vi && be.addInitHook('addHandler', 'tap', Sn),
+ be.mergeOptions({ touchZoom: qi && !Mi, bounceAtZoomLimits: !0 }));
var Zn = Ee.extend({
addHooks: function () {
- Q(this._map._container, 'leaflet-touch-zoom'),
- mt(this._map._container, 'touchstart', this._onTouchStart, this);
+ (Q(this._map._container, 'leaflet-touch-zoom'),
+ mt(this._map._container, 'touchstart', this._onTouchStart, this));
},
removeHooks: function () {
- tt(this._map._container, 'leaflet-touch-zoom'),
- ft(this._map._container, 'touchstart', this._onTouchStart, this);
+ (tt(this._map._container, 'leaflet-touch-zoom'),
+ ft(this._map._container, 'touchstart', this._onTouchStart, this));
},
_onTouchStart: function (t) {
var i = this._map;
@@ -6847,7 +6901,7 @@
) {
var e = i.mouseEventToContainerPoint(t.touches[0]),
n = i.mouseEventToContainerPoint(t.touches[1]);
- (this._centerPoint = i.getSize()._divideBy(2)),
+ ((this._centerPoint = i.getSize()._divideBy(2)),
(this._startLatLng = i.containerPointToLatLng(this._centerPoint)),
'center' !== i.options.touchZoom &&
(this._pinchStartLatLng = i.containerPointToLatLng(
@@ -6860,7 +6914,7 @@
i._stop(),
mt(document, 'touchmove', this._onTouchMove, this),
mt(document, 'touchend', this._onTouchEnd, this),
- Pt(t);
+ Pt(t));
}
},
_onTouchMove: function (t) {
@@ -6886,13 +6940,13 @@
this._zoom
);
}
- this._moved || (i._moveStart(!0, !1), (this._moved = !0)),
- g(this._animRequest);
+ (this._moved || (i._moveStart(!0, !1), (this._moved = !0)),
+ g(this._animRequest));
var a = e(i._move, i, this._center, this._zoom, {
pinch: !0,
round: !1,
});
- (this._animRequest = f(a, this, !0)), Pt(t);
+ ((this._animRequest = f(a, this, !0)), Pt(t));
}
},
_onTouchEnd: function () {
@@ -6915,7 +6969,7 @@
: (this._zooming = !1);
},
});
- be.addInitHook('addHandler', 'touchZoom', Zn),
+ (be.addInitHook('addHandler', 'touchZoom', Zn),
(be.BoxZoom = bn),
(be.DoubleClickZoom = Tn),
(be.Drag = zn),
@@ -7031,10 +7085,10 @@
(t.Map = be),
(t.map = function (t, i) {
return new be(t, i);
- });
+ }));
var En = window.L;
- (t.noConflict = function () {
- return (window.L = En), this;
+ ((t.noConflict = function () {
+ return ((window.L = En), this);
}),
- (window.L = t);
+ (window.L = t));
});
diff --git a/src/baseframe/static/js/mui.js b/src/baseframe/static/js/mui.js
index e223ee64..1d3126b1 100644
--- a/src/baseframe/static/js/mui.js
+++ b/src/baseframe/static/js/mui.js
@@ -48,14 +48,14 @@
s = t('src/js/select'),
a = t('src/js/tabs'),
l = t('src/js/textfield');
- (e.mui = { overlay: o, tabs: a.api }),
+ ((e.mui = { overlay: o, tabs: a.api }),
i.ready(function () {
- l.initListeners(),
+ (l.initListeners(),
s.initListeners(),
r.initListeners(),
n.initListeners(),
- a.initListeners();
- });
+ a.initListeners());
+ }));
}
})(window);
},
@@ -120,11 +120,11 @@
n < o;
n++
)
- (i += '@keyframes ' + (t = e[n])[1]),
+ ((i += '@keyframes ' + (t = e[n])[1]),
(i += '{from{transform:none;}to{transform:none;}}'),
(i += t[0]),
(i +=
- '{animation-duration:0.0001s;animation-name:' + t[1] + ';}');
+ '{animation-duration:0.0001s;animation-name:' + t[1] + ';}'));
s.loadStyle(i);
}
var r = t('./jqLite'),
@@ -135,9 +135,9 @@
animationEvents: a,
onAnimationStart: function (t, e) {
var i = l[t];
- i || (i = l[t] = []),
+ (i || (i = l[t] = []),
i.push(e),
- this.init || (o(), r.on(document, a, n, !0), (this.init = !0));
+ this.init || (o(), r.on(document, a, n, !0), (this.init = !0)));
},
};
},
@@ -159,10 +159,10 @@
d = document.documentElement.clientHeight,
m = e * r + 2 * s,
f = Math.min(m, d);
- (l = s + r - (n + o)),
+ ((l = s + r - (n + o)),
(l -= i * r),
(c = d - f + (u = -1 * t.getBoundingClientRect().top)),
- (a = Math.min(Math.max(l, u), c));
+ (a = Math.min(Math.max(l, u), c)));
var p,
h,
v = 0;
@@ -191,7 +191,9 @@
n = void 0 !== n && n;
var o = (t._muiEventCache = t._muiEventCache || {});
e.split(' ').map(function (e) {
- t.addEventListener(e, i, n), (o[e] = o[e] || []), o[e].push([i, n]);
+ (t.addEventListener(e, i, n),
+ (o[e] = o[e] || []),
+ o[e].push([i, n]));
});
}
function r(t, e, i, n) {
@@ -202,9 +204,9 @@
a = (t._muiEventCache = t._muiEventCache || {});
e.split(' ').map(function (e) {
for (s = (o = a[e] || []).length; s--; )
- (r = o[s]),
+ ((r = o[s]),
(void 0 === i || (r[0] === i && r[1] === n)) &&
- (o.splice(s, 1), t.removeEventListener(e, r[0], r[1]));
+ (o.splice(s, 1), t.removeEventListener(e, r[0], r[1])));
});
}
function s(t, e) {
@@ -256,8 +258,8 @@
addClass: function (t, e) {
if (e && t.setAttribute) {
for (var i, n = l(t), o = e.split(' '), r = 0; r < o.length; r++)
- (i = o[r].trim()),
- -1 === n.indexOf(' ' + i + ' ') && (n += i + ' ');
+ ((i = o[r].trim()),
+ -1 === n.indexOf(' ' + i + ' ') && (n += i + ' '));
t.setAttribute('class', n.trim());
}
},
@@ -299,7 +301,7 @@
t,
e,
function o(s) {
- i && i.apply(this, arguments), r(t, e, o, n);
+ (i && i.apply(this, arguments), r(t, e, o, n));
},
n
);
@@ -335,9 +337,9 @@
} catch (t) {}
i && c();
}
- n[s](l + 'DOMContentLoaded', u, !1),
+ (n[s](l + 'DOMContentLoaded', u, !1),
n[s](l + 'readystatechange', u, !1),
- o[s](l + 'load', u, !1);
+ o[s](l + 'load', u, !1));
}
},
removeClass: function (t, e) {
@@ -424,7 +426,7 @@
i = void 0 === i || i,
n = void 0 === n || n;
if ((s.initEvent(e, i, n), o)) for (r in o) s[r] = o[r];
- return t && t.dispatchEvent(s), s;
+ return (t && t.dispatchEvent(s), s);
},
enableScrollLock: function () {
if (1 === (d += 1)) {
@@ -436,7 +438,7 @@
u = a.documentElement,
p = a.body,
h = f();
- (t = ['overflow:hidden']),
+ ((t = ['overflow:hidden']),
h &&
(u.scrollHeight > u.clientHeight &&
((i = parseInt(c.css(p, 'padding-right')) + h),
@@ -449,7 +451,7 @@
(r = n(e)),
c.on(l, 'scroll', s, !0),
(o = { left: c.scrollLeft(l), top: c.scrollTop(l) }),
- c.addClass(p, m);
+ c.addClass(p, m));
}
},
log: function () {
@@ -490,10 +492,10 @@
if (!0 !== t._muiDropdown) {
t._muiDropdown = !0;
var e = t.tagName;
- ('INPUT' !== e && 'BUTTON' !== e) ||
+ (('INPUT' !== e && 'BUTTON' !== e) ||
t.hasAttribute('type') ||
(t.type = 'button'),
- s.on(t, 'click', o);
+ s.on(t, 'click', o));
}
}
function o(t) {
@@ -504,7 +506,7 @@
}
function r(t) {
function e() {
- s.removeClass(n, u), s.off(o, 'click', e);
+ (s.removeClass(n, u), s.off(o, 'click', e));
}
var i = t.parentNode,
n = t.nextElementSibling,
@@ -517,11 +519,11 @@
var r = i.getBoundingClientRect(),
a = t.getBoundingClientRect(),
l = a.top - r.top + a.height;
- s.css(n, 'top', l + 'px'),
+ (s.css(n, 'top', l + 'px'),
s.addClass(n, u),
setTimeout(function () {
s.on(o, 'click', e);
- }, 0);
+ }, 0));
})();
}
var s = t('./lib/jqLite'),
@@ -565,10 +567,10 @@
for (; o.firstChild; ) o.removeChild(o.firstChild);
e && o.appendChild(e);
} else
- (o = i.createElement('div')).setAttribute('id', p),
+ ((o = i.createElement('div')).setAttribute('id', p),
o.setAttribute('tabindex', '-1'),
e && o.appendChild(e),
- n.appendChild(o);
+ n.appendChild(o));
return (
h.test(navigator.userAgent) && f.css(o, 'cursor', 'pointer'),
t.keyboard ? r() : s(),
@@ -583,9 +585,9 @@
e = document.getElementById(p);
if (e) {
for (; e.firstChild; ) e.removeChild(e.firstChild);
- e.parentNode.removeChild(e), (t = e.muiOptions.onclose), u(e);
+ (e.parentNode.removeChild(e), (t = e.muiOptions.onclose), u(e));
}
- return m.disableScrollLock(), s(), d && d.focus(), t && t(), e;
+ return (m.disableScrollLock(), s(), d && d.focus(), t && t(), e);
}
function r() {
f.on(document, 'keyup', a);
@@ -614,12 +616,12 @@
var e;
if ('on' === t) {
for (var i, r, s, a = arguments.length - 1; a > 0; a--)
- (i = arguments[a]),
+ ((i = arguments[a]),
'object' === f.type(i) && (r = i),
- i instanceof Element && 1 === i.nodeType && (s = i);
- void 0 === (r = r || {}).keyboard && (r.keyboard = !0),
+ i instanceof Element && 1 === i.nodeType && (s = i));
+ (void 0 === (r = r || {}).keyboard && (r.keyboard = !0),
void 0 === r.static && (r.static = !1),
- (e = n(r, s));
+ (e = n(r, s)));
} else
'off' === t ? (e = o()) : m.raiseError("Expecting 'on' or 'off'");
return e;
@@ -641,17 +643,17 @@
if (!e.disabled) {
if (!i) {
var n = document.createElement('span');
- (n.className = 'mui-btn__ripple-container'),
+ ((n.className = 'mui-btn__ripple-container'),
(n.innerHTML = '
'),
e.appendChild(n),
(i = e._rippleEl = n.children[0]),
- s.on(e, d, r);
+ s.on(e, d, r));
}
var o,
l,
u = s.offset(e),
c = 'touchstart' === t.type ? t.touches[0] : t;
- (l =
+ ((l =
2 * (o = Math.sqrt(u.height * u.height + u.width * u.width)) +
'px'),
s.css(i, {
@@ -664,7 +666,7 @@
s.addClass(i, 'mui--is-visible'),
a.requestAnimationFrame(function () {
s.addClass(i, 'mui--is-animating');
- });
+ }));
}
}
}
@@ -705,7 +707,7 @@
((t._muiSelect = !0), !('ontouchstart' in v.documentElement))
) {
var e = t.parentNode;
- (e._selectEl = t),
+ ((e._selectEl = t),
(e._menu = null),
(e._q = ''),
(e._qTimeout = null),
@@ -715,16 +717,16 @@
d.on(e, 'click', l),
d.on(e, 'blur focus', r),
d.on(e, 'keydown', s),
- d.on(e, 'keypress', a);
+ d.on(e, 'keypress', a));
var i = document.createElement('div');
- (i.className = 'mui-event-trigger'),
+ ((i.className = 'mui-event-trigger'),
e.appendChild(i),
d.on(i, f.animationEvents, function (t) {
- t.stopPropagation(),
+ (t.stopPropagation(),
'mui-node-disabled' === t.animationName
? t.target.parentNode.removeAttribute('tabIndex')
- : (t.target.parentNode.tabIndex = 0);
- });
+ : (t.target.parentNode.tabIndex = 0));
+ }));
}
}
function o(t) {
@@ -739,7 +741,7 @@
i = this._menu;
if (i) {
if (9 === e) return i.destroy();
- (27 !== e && 40 !== e && 38 !== e && 13 !== e) ||
+ ((27 !== e && 40 !== e && 38 !== e && 13 !== e) ||
t.preventDefault(),
27 === e
? i.destroy()
@@ -747,7 +749,7 @@
? i.increment()
: 38 === e
? i.decrement()
- : 13 === e && (i.selectCurrent(), i.destroy());
+ : 13 === e && (i.selectCurrent(), i.destroy()));
} else
(32 !== e && 38 !== e && 40 !== e) ||
(t.preventDefault(), u(this));
@@ -757,11 +759,11 @@
var e = this._menu;
if (!t.defaultPrevented && e) {
var i = this;
- clearTimeout(this._qTimeout),
+ (clearTimeout(this._qTimeout),
(this._q += t.key),
(this._qTimeout = setTimeout(function () {
i._q = '';
- }, 300));
+ }, 300)));
var n,
o = new RegExp('^' + this._q, 'i'),
r = e.itemArray;
@@ -778,29 +780,29 @@
function u(t) {
t._menu ||
(t._menu = new c(t, t._selectEl, function () {
- (t._menu = null), t.focus();
+ ((t._menu = null), t.focus());
}));
}
function c(t, e, i) {
- m.enableScrollLock(),
+ (m.enableScrollLock(),
(this.itemArray = []),
(this.origPos = null),
(this.currentPos = null),
(this.selectEl = e),
(this.wrapperEl = t),
- (this.menuEl = this._createMenuEl(t, e));
+ (this.menuEl = this._createMenuEl(t, e)));
var n = m.callback;
- (this.onClickCB = n(this, 'onClick')),
+ ((this.onClickCB = n(this, 'onClick')),
(this.destroyCB = n(this, 'destroy')),
(this.wrapperCallbackFn = i),
t.appendChild(this.menuEl),
- d.scrollTop(this.menuEl, this.menuEl._scrollTop);
+ d.scrollTop(this.menuEl, this.menuEl._scrollTop));
var o = this.destroyCB;
- d.on(this.menuEl, 'click', this.onClickCB),
+ (d.on(this.menuEl, 'click', this.onClickCB),
d.on(b, 'resize', o),
setTimeout(function () {
d.on(v, 'click', o);
- }, 0);
+ }, 0));
}
var d = t('./lib/jqLite'),
m = t('./lib/util'),
@@ -809,7 +811,7 @@
h = 'mui--is-selected',
v = document,
b = window;
- (c.prototype._createMenuEl = function (t, e) {
+ ((c.prototype._createMenuEl = function (t, e) {
var i,
n,
o,
@@ -843,7 +845,7 @@
l < u;
l++
)
- (i = o[l]),
+ ((i = o[l]),
((n = v.createElement('div')).textContent = i.textContent),
r && d.addClass(n, 'mui-optgroup__option'),
i.disabled
@@ -854,10 +856,10 @@
(d.addClass(n, h), (y = c.children.length), (g = b)),
f.push(n),
(b += 1)),
- C.appendChild(n);
- c.appendChild(C), (this.origPos = g), (this.currentPos = g);
+ C.appendChild(n));
+ (c.appendChild(C), (this.origPos = g), (this.currentPos = g));
var E = p.getMenuPositionalCSS(t, c.children.length, y);
- return d.css(c, E), (c._scrollTop = E.scrollTop), c;
+ return (d.css(c, E), (c._scrollTop = E.scrollTop), c);
}),
(c.prototype.onClick = function (t) {
t.stopPropagation();
@@ -886,15 +888,15 @@
m.dispatchEvent(this.selectEl, 'change', !1, !1));
}),
(c.prototype.selectPos = function (t) {
- d.removeClass(this.itemArray[this.currentPos], h),
+ (d.removeClass(this.itemArray[this.currentPos], h),
(this.currentPos = t),
- d.addClass(this.itemArray[t], h);
+ d.addClass(this.itemArray[t], h));
}),
(c.prototype.destroy = function () {
- m.disableScrollLock(!0),
+ (m.disableScrollLock(!0),
d.off(this.menuEl, 'click', this.clickCallbackFn),
d.off(v, 'click', this.destroyCB),
- d.off(b, 'resize', this.destroyCB);
+ d.off(b, 'resize', this.destroyCB));
var t = this.menuEl.parentNode;
t && (t.removeChild(this.menuEl), this.wrapperCallbackFn());
}),
@@ -911,7 +913,7 @@
n(t.target);
});
},
- });
+ }));
},
{
'./lib/animationHelpers': 3,
@@ -1001,9 +1003,9 @@
activate: function (t) {
var e = '[' + c + '=' + t + ']',
i = document.querySelectorAll(e);
- i.length ||
+ (i.length ||
l.raiseError('Tab control for pane "' + t + '" not found'),
- r(i[0]);
+ r(i[0]));
},
},
};
@@ -1023,7 +1025,7 @@
(s.removeClass(t, c), s.addClass(t, u), s.off(t, 'blur', e));
}),
s.one(t, 'input change', function () {
- s.removeClass(t, d), s.addClass(t, m);
+ (s.removeClass(t, d), s.addClass(t, m));
}),
s.on(t, 'input change', o));
}
@@ -1058,7 +1060,7 @@
)
n(e[i]);
- l.onAnimationStart('mui-textfield-inserted', function (t) {
+ (l.onAnimationStart('mui-textfield-inserted', function (t) {
n(t.target);
}),
setTimeout(function () {
@@ -1087,7 +1089,7 @@
var i = e.previousElementSibling;
i && i.focus();
}
- });
+ }));
},
};
},
diff --git a/src/baseframe/static/js/pace.js b/src/baseframe/static/js/pace.js
index 5bc25257..b5dd06a0 100644
--- a/src/baseframe/static/js/pace.js
+++ b/src/baseframe/static/js/pace.js
@@ -163,7 +163,7 @@
q = function (a) {
var b, c, d, e, f;
for (c = b = 0, e = 0, f = a.length; f > e; e++)
- (d = a[e]), (c += Math.abs(d)), b++;
+ ((d = a[e]), (c += Math.abs(d)), b++);
return c / b;
},
x = function (a, b) {
@@ -222,12 +222,12 @@
null != (g = this.bindings) ? g[c] : void 0)
) {
for (e = 0, i = []; e < this.bindings[c].length; )
- (h = this.bindings[c][e]),
+ ((h = this.bindings[c][e]),
(d = h.handler),
(b = h.ctx),
(f = h.once),
d.apply(null != b ? b : this, a),
- i.push(f ? this.bindings[c].splice(e, 1) : e++);
+ i.push(f ? this.bindings[c].splice(e, 1) : e++));
return i;
}
}),
@@ -244,12 +244,12 @@
S > Q;
Q++
)
- (K = U[Q]), D[K] === !0 && (D[K] = u[K]);
- (i = (function (a) {
+ ((K = U[Q]), D[K] === !0 && (D[K] = u[K]));
+ ((i = (function (a) {
function b() {
return (V = b.__super__.constructor.apply(this, arguments));
}
- return Z(b, a), b;
+ return (Z(b, a), b);
})(Error)),
(b = (function () {
function a() {
@@ -260,7 +260,7 @@
var a;
if (null == this.el) {
if (((a = document.querySelector(D.target)), !a)) throw new i();
- (this.el = document.createElement('div')),
+ ((this.el = document.createElement('div')),
(this.el.className = 'pace pace-active'),
(document.body.className = document.body.className.replace(
/pace-done/g,
@@ -271,7 +271,7 @@
'
\n
'),
null != a.firstChild
? a.insertBefore(this.el, a.firstChild)
- : a.appendChild(this.el);
+ : a.appendChild(this.el));
}
return this.el;
}),
@@ -289,7 +289,7 @@
);
}),
(a.prototype.update = function (a) {
- return (this.progress = a), this.render();
+ return ((this.progress = a), this.render());
}),
(a.prototype.destroy = function () {
try {
@@ -311,7 +311,7 @@
f > e;
e++
)
- (b = g[e]), (a.children[0].style[b] = d);
+ ((b = g[e]), (a.children[0].style[b] = d));
return (
(!this.lastRenderedProgress ||
this.lastRenderedProgress | (0 !== this.progress) | 0) &&
@@ -342,7 +342,7 @@
var c, d, e, f, g;
if (null != this.bindings[a]) {
for (f = this.bindings[a], g = [], d = 0, e = f.length; e > d; d++)
- (c = f[d]), g.push(c.call(this, b));
+ ((c = f[d]), g.push(c.call(this, b)));
return g;
}
}),
@@ -364,10 +364,10 @@
f = [];
for (d in b.prototype)
try {
- (e = b.prototype[d]),
+ ((e = b.prototype[d]),
f.push(
null == a[d] && 'function' != typeof e ? (a[d] = e) : void 0
- );
+ ));
} catch (g) {
c = g;
}
@@ -410,7 +410,7 @@
function b() {
var a,
c = this;
- b.__super__.constructor.apply(this, arguments),
+ (b.__super__.constructor.apply(this, arguments),
(a = function (a) {
var b;
return (
@@ -425,15 +425,15 @@
}),
(window.XMLHttpRequest = function (b) {
var c;
- return (c = new P(b)), a(c), c;
- });
+ return ((c = new P(b)), a(c), c);
+ }));
try {
w(window.XMLHttpRequest, P);
} catch (d) {}
if (null != O) {
window.XDomainRequest = function () {
var b;
- return (b = new O()), a(b), b;
+ return ((b = new O()), a(b), b);
};
try {
w(window.XDomainRequest, O);
@@ -459,11 +459,11 @@
} catch (d) {}
}
}
- return Z(b, a), b;
+ return (Z(b, a), b);
})(h)),
(R = null),
(y = function () {
- return null == R && (R = new k()), R;
+ return (null == R && (R = new k()), R);
}),
(I = function (a) {
var b, c, d, e;
@@ -513,10 +513,10 @@
(a = (function () {
function a() {
var a = this;
- (this.elements = []),
+ ((this.elements = []),
y().on('request', function () {
return a.watch.apply(a, arguments);
- });
+ }));
}
return (
(a.prototype.watch = function (a) {
@@ -561,16 +561,16 @@
e > d;
d++
)
- (b = g[d]),
+ ((b = g[d]),
a.addEventListener(
b,
function () {
return (h.progress = 100);
},
!1
- );
+ ));
else
- (f = a.onreadystatechange),
+ ((f = a.onreadystatechange),
(a.onreadystatechange = function () {
var b;
return (
@@ -579,7 +579,7 @@
: 3 === a.readyState && (h.progress = 50),
'function' == typeof f ? f.apply(null, arguments) : void 0
);
- });
+ }));
}
return a;
})()),
@@ -595,14 +595,14 @@
d > c;
c++
)
- (b = e[c]),
+ ((b = e[c]),
a.addEventListener(
b,
function () {
return (f.progress = 100);
},
!1
- );
+ ));
}
return a;
})()),
@@ -619,13 +619,13 @@
d > c;
c++
)
- (b = f[c]), this.elements.push(new e(b));
+ ((b = f[c]), this.elements.push(new e(b)));
}
return a;
})()),
(e = (function () {
function a(a) {
- (this.selector = a), (this.progress = 0), this.check();
+ ((this.selector = a), (this.progress = 0), this.check());
}
return (
(a.prototype.check = function () {
@@ -647,7 +647,7 @@
var a,
b,
c = this;
- (this.progress =
+ ((this.progress =
null != (b = this.states[document.readyState]) ? b : 100),
(a = document.onreadystatechange),
(document.onreadystatechange = function () {
@@ -656,10 +656,11 @@
(c.progress = c.states[document.readyState]),
'function' == typeof a ? a.apply(null, arguments) : void 0
);
- });
+ }));
}
return (
- (a.prototype.states = { loading: 0, interactive: 50, complete: 100 }), a
+ (a.prototype.states = { loading: 0, interactive: 50, complete: 100 }),
+ a
);
})()),
(f = (function () {
@@ -670,7 +671,7 @@
d,
e,
f = this;
- (this.progress = 0),
+ ((this.progress = 0),
(a = 0),
(e = []),
(d = 0),
@@ -687,18 +688,18 @@
? ((f.progress = 100), clearInterval(b))
: (f.progress = 100 * (3 / (a + 3)))
);
- }, 50));
+ }, 50)));
}
return a;
})()),
(m = (function () {
function a(a) {
- (this.source = a),
+ ((this.source = a),
(this.last = this.sinceLastUpdate = 0),
(this.rate = D.initialRate),
(this.catchup = 0),
(this.progress = this.lastProgress = 0),
- null != this.source && (this.progress = F(this.source, 'progress'));
+ null != this.source && (this.progress = F(this.source, 'progress')));
}
return (
(a.prototype.tick = function (a, b) {
@@ -742,12 +743,12 @@
null != window.history.pushState &&
((T = window.history.pushState),
(window.history.pushState = function () {
- return z(), T.apply(window.history, arguments);
+ return (z(), T.apply(window.history, arguments));
})),
null != window.history.replaceState &&
((W = window.history.replaceState),
(window.history.replaceState = function () {
- return z(), W.apply(window.history, arguments);
+ return (z(), W.apply(window.history, arguments));
})),
(l = { ajax: a, elements: d, document: c, eventLag: f }),
(B = function () {
@@ -760,14 +761,14 @@
e > c;
c++
)
- (a = g[c]), D[a] !== !1 && L.push(new l[a](D[a]));
+ ((a = g[c]), D[a] !== !1 && L.push(new l[a](D[a])));
for (
i = null != (h = D.extraSources) ? h : [], d = 0, f = i.length;
f > d;
d++
)
- (K = i[d]), L.push(new K(D));
- return (j.bar = r = new b()), (H = []), (M = new m());
+ ((K = i[d]), L.push(new K(D)));
+ return ((j.bar = r = new b()), (H = []), (M = new m()));
})(),
(j.stop = function () {
return (
@@ -780,7 +781,7 @@
);
}),
(j.restart = function () {
- return j.trigger('restart'), j.stop(), j.start();
+ return (j.trigger('restart'), j.stop(), j.start());
}),
(j.go = function () {
var a;
@@ -805,10 +806,10 @@
v > t;
k = ++t
)
- (g = h[k]),
+ ((g = h[k]),
(n = null != o[k] ? o[k] : (o[k] = new m(g))),
(f &= n.done),
- n.done || (e++, (p += n.tick(b)));
+ n.done || (e++, (p += n.tick(b))));
return (
(d = p / e),
r.update(M.tick(b, d)),
@@ -817,7 +818,7 @@
j.trigger('done'),
setTimeout(
function () {
- return r.finish(), (j.running = !1), j.trigger('hide');
+ return (r.finish(), (j.running = !1), j.trigger('hide'));
},
Math.max(D.ghostTime, Math.max(D.minTime - (C() - a), 0))
))
@@ -827,7 +828,7 @@
);
}),
(j.start = function (a) {
- v(D, a), (j.running = !0);
+ (v(D, a), (j.running = !0));
try {
r.render();
} catch (b) {
@@ -843,5 +844,5 @@
})
: 'object' == typeof exports
? (module.exports = j)
- : D.startOnPageLoad && j.start();
+ : D.startOnPageLoad && j.start());
}).call(this);
diff --git a/src/baseframe/static/js/ractive-transitions-fly.js b/src/baseframe/static/js/ractive-transitions-fly.js
index b1364191..55924ab3 100644
--- a/src/baseframe/static/js/ractive-transitions-fly.js
+++ b/src/baseframe/static/js/ractive-transitions-fly.js
@@ -11,14 +11,14 @@
}
function e(e, o) {
var i, r, a, s;
- (o = e.processParams(o, n)),
+ ((o = e.processParams(o, n)),
(i = t(o.x)),
(r = t(o.y)),
(a = { transform: 'translate(' + i + ',' + r + ')', opacity: 0 }),
e.isIntro
? ((s = e.getStyle(['opacity', 'transform'])), e.setStyle(a))
: (s = a),
- e.animateStyle(s, o).then(e.complete);
+ e.animateStyle(s, o).then(e.complete));
}
var n = { duration: 400, easing: 'easeOut', opacity: 0, x: -500, y: 0 };
return e;
diff --git a/src/baseframe/static/js/ractive.js b/src/baseframe/static/js/ractive.js
index a4805bb3..3b3baa16 100644
--- a/src/baseframe/static/js/ractive.js
+++ b/src/baseframe/static/js/ractive.js
@@ -111,7 +111,7 @@
i++
)
n[i - 1] = arguments[i];
- (t = c(t, n)), Sa(t, n);
+ ((t = c(t, n)), Sa(t, n));
}
function p(t) {
for (
@@ -120,7 +120,7 @@
i++
)
n[i - 1] = arguments[i];
- (t = c(t, n)), Ra[t] || ((Ra[t] = !0), Sa(t, n));
+ ((t = c(t, n)), Ra[t] || ((Ra[t] = !0), Sa(t, n)));
}
function m() {
Qb.DEBUG && d.apply(null, arguments);
@@ -157,8 +157,8 @@
r--;
)
- (o = n[r].map(i).join('.')),
- s.hasOwnProperty(o) || (s.push(o), (s[o] = !0));
+ ((o = n[r].map(i).join('.')),
+ s.hasOwnProperty(o) || (s.push(o), (s[o] = !0)));
return s;
}
function x(t) {
@@ -193,7 +193,7 @@
function k(t, e, n, i) {
var r = t[e];
if (!r || (!r.equalsOrStartsWith(i) && r.equalsOrStartsWith(n)))
- return (t[e] = r ? r.replace(n, i) : i), !0;
+ return ((t[e] = r ? r.replace(n, i) : i), !0);
}
function E(t) {
var e = t.slice(2);
@@ -260,7 +260,7 @@
return Ha(this, t, void 0 === e ? 1 : +e);
}
function T(t) {
- (this.event = t), (this.method = 'on' + t), (this.deprecate = tu[t]);
+ ((this.event = t), (this.method = 'on' + t), (this.deprecate = tu[t]));
}
function F(t, e) {
var n = t.indexOf(e);
@@ -315,16 +315,16 @@
}
if ('function' == typeof r) {
var o, a, u;
- (a = function (e) {
+ ((a = function (e) {
o || ((o = !0), U(t, e, n, i));
}),
(u = function (t) {
o || ((o = !0), i(t));
- });
+ }));
try {
r.call(e, a, u);
} catch (s) {
- if (!o) return i(s), void (o = !0);
+ if (!o) return (i(s), void (o = !0));
}
} else n(e);
}
@@ -351,9 +351,9 @@
throw new Error(
'Could not resolve reference - too many "../" prefixes'
);
- n.pop(), (e = e.substring(3));
+ (n.pop(), (e = e.substring(3)));
}
- return n.push(e), _(n.join('.'));
+ return (n.push(e), _(n.join('.')));
}
return _(t ? t + e.replace(/^\.\//, '.') : e.replace(/^\.\/?/, ''));
}
@@ -427,21 +427,21 @@
}
function X() {
for (var t, e, n; cu.ractives.length; )
- (e = cu.ractives.pop()),
+ ((e = cu.ractives.pop()),
(n = e.viewmodel.applyChanges()),
- n && pu.fire(e, n);
+ n && pu.fire(e, n));
for (tt(), t = 0; t < cu.views.length; t += 1) cu.views[t].update();
for (cu.views.length = 0, t = 0; t < cu.tasks.length; t += 1) cu.tasks[t]();
- return (cu.tasks.length = 0), cu.ractives.length ? X() : void 0;
+ return ((cu.tasks.length = 0), cu.ractives.length ? X() : void 0);
}
function tt() {
var t, e, n, i;
for (t = du.length; t--; )
- (e = du[t]),
+ ((e = du[t]),
e.keypath
? du.splice(t, 1)
: (n = uu(e.root, e.ref, e.parentFragment)) &&
- ((i || (i = [])).push({ item: e, keypath: n }), du.splice(t, 1));
+ ((i || (i = [])).push({ item: e, keypath: n }), du.splice(t, 1)));
i && i.forEach(et);
}
function et(t) {
@@ -455,7 +455,7 @@
})),
'object' == typeof t)
) {
- (n = e || {}),
+ ((n = e || {}),
(u = n.easing),
(h = n.duration),
(a = []),
@@ -469,7 +469,7 @@
return function (e, n) {
d[t] = n;
};
- }));
+ })));
for (s in t)
t.hasOwnProperty(s) &&
((c || l) &&
@@ -568,7 +568,7 @@
}
function ut(t) {
var e, n;
- for (e = [t], n = at(t); n; ) e.push(n), (n = at(n));
+ for (e = [t], n = at(t); n; ) (e.push(n), (n = at(n)));
return e;
}
function ht(t, e, n, i) {
@@ -654,11 +654,11 @@
o = void 0 === arguments[4] ? !1 : arguments[4],
a = !0;
for (Uu.enqueue(t, n), s = e.length; s >= 0; s--)
- (r = t._subs[e[s]]), r && (a = gt(t, r, n, i) && a);
+ ((r = t._subs[e[s]]), r && (a = gt(t, r, n, i) && a));
if ((Uu.dequeue(t), t.parent && a)) {
if (o && t.component) {
var u = t.component.name + '.' + e[e.length - 1];
- (e = _(u).wildcardMatches()), n && (n.component = t);
+ ((e = _(u).wildcardMatches()), n && (n.component = t));
}
vt(t.parent, e, n, i);
}
@@ -666,7 +666,7 @@
function gt(t, e, n, i) {
var r = null,
s = !1;
- n && !n._noArg && (i = [n].concat(i)), (e = e.slice());
+ (n && !n._noArg && (i = [n].concat(i)), (e = e.slice()));
for (var o = 0, a = e.length; a > o; o += 1)
e[o].apply(t, i) === !1 && (s = !0);
return (
@@ -703,17 +703,17 @@
);
if (((e = t(e)), (n = t(n) || null), !e))
throw new Error('You must specify a valid target to insert into');
- e.insertBefore(this.detach(), n),
+ (e.insertBefore(this.detach(), n),
(this.el = e),
(e.__ractive_instances__ || (e.__ractive_instances__ = [])).push(this),
(this.detached = null),
- xt(this);
+ xt(this));
}
function xt(t) {
- Qu.fire(t),
+ (Qu.fire(t),
t.findAllComponents('*').forEach(function (t) {
xt(t.instance);
- });
+ }));
}
function kt(t, e, n) {
var i, r;
@@ -741,7 +741,7 @@
}
function _t(t, e, n, i) {
var r, s, o;
- (e = _(C(e))),
+ ((e = _(C(e))),
(i = i || ah),
e.isPattern
? ((r = new sh(t, e, n, i)),
@@ -750,7 +750,7 @@
: (r = new Gu(t, e, n, i)),
r.init(i.init),
t.viewmodel.register(e, r, s ? 'patternObservers' : 'observers'),
- (r.ready = !0);
+ (r.ready = !0));
var a = {
cancel: function () {
var n;
@@ -763,12 +763,12 @@
(o = !0));
},
};
- return t._observers.push(a), a;
+ return (t._observers.push(a), a);
}
function At(t, e, n) {
var i, r, s, o;
if (h(t)) {
- (n = e), (r = t), (i = []);
+ ((n = e), (r = t), (i = []));
for (t in r)
r.hasOwnProperty(t) && ((e = r[t]), i.push(this.observe(t, e, n)));
return {
@@ -778,10 +778,10 @@
};
}
if ('function' == typeof t)
- return (n = e), (e = t), (t = ''), oh(this, t, e, n);
+ return ((n = e), (e = t), (t = ''), oh(this, t, e, n));
if (((s = t.split(' ')), 1 === s.length)) return oh(this, t, e, n);
for (i = [], o = s.length; o--; )
- (t = s[o]), t && i.push(oh(this, t, e, n));
+ ((t = s[o]), t && i.push(oh(this, t, e, n)));
return {
cancel: function () {
for (; i.length; ) i.pop().cancel();
@@ -792,7 +792,7 @@
var i = this.observe(
t,
function () {
- e.apply(this, arguments), i.cancel();
+ (e.apply(this, arguments), i.cancel());
},
{ init: !1, defer: n && n.defer }
);
@@ -802,14 +802,14 @@
var n,
i = this;
if (t)
- (n = t.split(' ').map(ch).filter(lh)),
+ ((n = t.split(' ').map(ch).filter(lh)),
n.forEach(function (t) {
var n, r;
(n = i._subs[t]) &&
(e
? ((r = n.indexOf(e)), -1 !== r && n.splice(r, 1))
: (i._subs[t] = []));
- });
+ }));
else for (t in this._subs) delete this._subs[t];
return this;
}
@@ -841,7 +841,7 @@
}
function Pt(t, e) {
var n = this.on(t, function () {
- e.apply(this, arguments), n.cancel();
+ (e.apply(this, arguments), n.cancel());
});
return n;
}
@@ -866,7 +866,7 @@
h.push(u);
for (; o > u; u += 1) h.push(-1);
for (; r > u; u += 1) h.push(u + a);
- return (h.touchedFrom = 0 !== a ? i[0] : t.length), h;
+ return ((h.touchedFrom = 0 !== a ? i[0] : t.length), h);
}
function Ft(t, e, n) {
switch (e) {
@@ -879,7 +879,7 @@
)
n.push(0);
- return (n[1] = Math.min(n[1], t.length - n[0])), n;
+ return ((n[1] = Math.min(n[1], t.length - n[0])), n);
case 'sort':
case 'reverse':
return null;
@@ -918,7 +918,7 @@
!this.append && e)
) {
var a = e.__ractive_instances__;
- a && a.length && jt(a), (e.innerHTML = '');
+ (a && a.length && jt(a), (e.innerHTML = ''));
}
return (
this.cssId && Ah.apply(),
@@ -960,12 +960,12 @@
for (e = []; (n = Nh.exec(t)); )
e.push({ str: n[0], base: n[1], modifiers: n[2] });
for (s = e.map(Lt), u = e.length; u--; )
- (a = s.slice()),
+ ((a = s.slice()),
(r = e[u]),
(a[u] = r.base + i + r.modifiers || ''),
(o = s.slice()),
(o[u] = i + ' ' + o[u]),
- h.push(a.join(' '), o.join(' '));
+ h.push(a.join(' '), o.join(' ')));
return h.join(', ');
}),
(n = Ih.test(t)
@@ -1082,7 +1082,7 @@
t.includeLinePositions && (i.p = t.getLinePos(n)),
i
);
- return (t.pos = n), null;
+ return ((t.pos = n), null);
}
function Qt(t) {
var e;
@@ -1275,7 +1275,7 @@
}
}
var n;
- return se(t, (n = [])), { r: n, s: e(t) };
+ return (se(t, (n = [])), { r: n, s: e(t) });
}
function se(t, e) {
var n, i;
@@ -1284,7 +1284,7 @@
)
if (h(i)) se(i, e);
else for (n = i.length; n--; ) se(i[n], e);
- t.x && se(t.x, e), t.r && se(t.r, e), t.v && se(t.v, e);
+ (t.x && se(t.x, e), t.r && se(t.r, e), t.v && se(t.v, e));
}
function oe(t, e) {
var n;
@@ -1304,9 +1304,9 @@
}
function ae(t) {
for (var e, n = []; t.t === bc && t.r.t === yc; )
- (e = t.r),
+ ((e = t.r),
n.unshift(e.x ? (e.x.t === gc ? e.x : Pl(e.x)) : e.n),
- (t = t.x);
+ (t = t.x));
return t.t !== gc ? null : { r: t.n, m: n };
}
function ue(t, e) {
@@ -1370,7 +1370,7 @@
if (((n = t.pos), (i = Ol(t)), !i)) return null;
for (r = 0; r < e.length; r += 1)
if (t.remaining().substr(0, e[r].length) === e[r]) return i;
- return (t.pos = n), sl(t);
+ return ((t.pos = n), sl(t));
}
function de(t, e) {
var n, i, r, s;
@@ -1381,7 +1381,7 @@
s = o;
}
if (!i) {
- if ('!' === t.str.charAt(n)) return (t.pos = n), null;
+ if ('!' === t.str.charAt(n)) return ((t.pos = n), null);
if (s) throw s;
}
if (
@@ -1392,7 +1392,7 @@
if ('!' === t.nextChar()) return null;
t.error('Expected expression or legal reference');
}
- return (r = { t: Hh }), Tl(i, r), r;
+ return ((r = { t: Hh }), Tl(i, r), r);
}
function pe(t, e) {
var n, i, r;
@@ -1454,13 +1454,13 @@
if (((n = t.pos), t.matchString('^'))) r = { t: Gh, f: [], n: Sc };
else {
if (!t.matchString('#')) return null;
- (r = { t: Gh, f: [] }),
+ ((r = { t: Gh, f: [] }),
t.matchString('partial') &&
((t.pos = n - t.standardDelimiters[0].length),
t.error(
'Partial definitions can only be at the top level of the template, or immediately inside components'
)),
- (u = t.matchPattern(Kl)) && ((d = u), (r.n = $l[u]));
+ (u = t.matchPattern(Kl)) && ((d = u), (r.n = $l[u])));
}
if (
(t.allowWhitespace(),
@@ -1471,25 +1471,25 @@
var p = void 0;
r.i = (p = t.matchPattern(Hl)) ? f + ',' + p : f;
}
- t.allowWhitespace(),
+ (t.allowWhitespace(),
t.matchString(e.close) ||
t.error("Expected closing delimiter '" + e.close + "'"),
(t.sectionDepth += 1),
(o = r.f),
- (c = []);
+ (c = []));
do
if ((s = Ul(t, e)))
- d && s.r !== d && t.error('Expected ' + e.open + '/' + d + e.close),
+ (d && s.r !== d && t.error('Expected ' + e.open + '/' + d + e.close),
(t.sectionDepth -= 1),
- (l = !0);
+ (l = !0));
else if ((s = Bl(t, e)))
- r.n === Sc && t.error('{{else}} not allowed in {{#unless}}'),
+ (r.n === Sc && t.error('{{else}} not allowed in {{#unless}}'),
a && t.error('illegal {{elseif...}} after {{else}}'),
h || (h = be(i, r.n)),
h.f.push({ t: Gh, n: Ac, x: Pl(xe(c.concat(s.x))), f: (o = []) }),
- c.push(we(s.x));
+ c.push(we(s.x)));
else if ((s = Wl(t, e)))
- r.n === Sc && t.error('{{else}} not allowed in {{#unless}}'),
+ (r.n === Sc && t.error('{{else}} not allowed in {{#unless}}'),
a &&
t.error(
'there can only be one {{else}} block, at the end of a section'
@@ -1497,7 +1497,7 @@
(a = !0),
h
? h.f.push({ t: Gh, n: Ac, x: Pl(xe(c)), f: (o = []) })
- : ((h = be(i, r.n)), (o = h.f));
+ : ((h = be(i, r.n)), (o = h.f)));
else {
if (((s = t.read(td)), !s)) break;
o.push(s);
@@ -1593,19 +1593,19 @@
function Te(t, e, n, i, r) {
var o, a, u, h, c, l, f, d;
for (hf(t), o = t.length; o--; )
- (a = t[o]),
- a.exclude ? t.splice(o, 1) : e && a.t === ec && t.splice(o, 1);
+ ((a = t[o]),
+ a.exclude ? t.splice(o, 1) : e && a.t === ec && t.splice(o, 1));
for (cf(t, i ? pf : null, r ? mf : null), o = t.length; o--; ) {
if (((a = t[o]), a.f)) {
var p = a.t === Xh && df.test(a.e);
- (c = n || p),
+ ((c = n || p),
!n && p && cf(a.f, vf, gf),
c ||
((u = t[o - 1]),
(h = t[o + 1]),
(!u || ('string' == typeof u && mf.test(u))) && (l = !0),
(!h || ('string' == typeof h && pf.test(h))) && (f = !0)),
- Te(a.f, e, c, l, f);
+ Te(a.f, e, c, l, f));
}
if (
(a.l && (Te(a.l.f, e, n, l, f), t.splice(o + 1, 0, a.l), delete a.l),
@@ -1694,14 +1694,14 @@
function De(t) {
var e, n;
for (t.inAttribute = !0, e = [], n = Lc(t) || Ne(t); null !== n; )
- e.push(n), (n = Lc(t) || Ne(t));
+ (e.push(n), (n = Lc(t) || Ne(t)));
return e.length ? ((t.inAttribute = !1), e) : null;
}
function Ie(t, e) {
var n, i, r;
if (((n = t.pos), !t.matchString(e))) return null;
for (t.inAttribute = e, i = [], r = Lc(t) || Le(t, e); null !== r; )
- i.push(r), (r = Lc(t) || Le(t, e));
+ (i.push(r), (r = Lc(t) || Le(t, e)));
return t.matchString(e) ? ((t.inAttribute = !1), i) : ((t.pos = n), null);
}
function Le(t, e) {
@@ -1758,8 +1758,8 @@
for (; t.length; )
if (((o = t.shift()), 'string' == typeof o)) {
if (((a = o.indexOf(':')), -1 !== a)) {
- a && u.push(o.substr(0, a)),
- o.length > a + 1 && (h[0] = o.substring(a + 1));
+ (a && u.push(o.substr(0, a)),
+ o.length > a + 1 && (h[0] = o.substring(a + 1)));
break;
}
u.push(o);
@@ -1799,18 +1799,18 @@
Ff.test(t.nextChar()) || t.error('Illegal tag name'),
s = function (e, i) {
var r = i.n || i;
- Nf.test(r) &&
+ (Nf.test(r) &&
((t.pos -= r.length),
t.error(
'Cannot use reserved event names (change, reset, teardown, update, construct, config, init, render, unrender, detach, insert)'
)),
- (n.v[e] = i);
+ (n.v[e] = i));
},
t.allowWhitespace();
(o = Lc(t) || xf(t));
)
- o.name
+ (o.name
? (i = Df[o.name])
? (n[i] = Sf(o.value, t))
: (r = jf.exec(o.name))
@@ -1819,7 +1819,7 @@
(n.a || (n.a = {}),
(n.a[o.name] = o.value || ('' === o.value ? '' : 0)))
: (n.m || (n.m = []), n.m.push(o)),
- t.allowWhitespace();
+ t.allowWhitespace());
if (
(t.allowWhitespace(), t.matchString('/') && (u = !0), !t.matchString('>'))
)
@@ -1827,10 +1827,10 @@
var g = n.e.toLowerCase(),
y = t.preserveWhitespace;
if (!u && !bl.test(n.e)) {
- t.elementStack.push(g),
+ (t.elementStack.push(g),
('script' === g || 'style' === g) && (t.inside = g),
(h = []),
- (c = wa(null));
+ (c = wa(null)));
do
if (((p = t.pos), (m = t.remaining()), We(g, m)))
if ((v = yf(t))) {
@@ -1838,12 +1838,12 @@
var b = v.e.toLowerCase();
if (b !== g && ((t.pos = p), !~t.elementStack.indexOf(b))) {
var w = 'Unexpected closing tag';
- bl.test(b) &&
+ (bl.test(b) &&
(w +=
' (<' +
b +
'> is a void element - it cannot contain children)'),
- t.error(w);
+ t.error(w));
}
} else
(f = Ul(t, {
@@ -1862,7 +1862,7 @@
: (d = !0);
else d = !0;
while (!d);
- h.length && (n.f = h), l && (n.p = c), t.elementStack.pop();
+ (h.length && (n.f = h), l && (n.p = c), t.elementStack.pop());
}
return (
(t.inside = null),
@@ -1912,7 +1912,7 @@
i = t.standardDelimiters[1],
r = void 0,
s = void 0;
- if (!t.matchPattern(Bf) || !t.matchString(n)) return (t.pos = e), null;
+ if (!t.matchPattern(Bf) || !t.matchString(n)) return ((t.pos = e), null);
var o = t.matchPattern(qf);
if (
(v(
@@ -1926,7 +1926,7 @@
),
!t.matchString(i) || !t.matchPattern($f))
)
- return (t.pos = e), null;
+ return ((t.pos = e), null);
r = [];
var a = new RegExp(
'^'
@@ -1948,12 +1948,12 @@
e = t.pos;
var o = t.standardDelimiters;
if (!t.matchString(o[0])) return null;
- if (!t.matchPattern(Zf)) return (t.pos = e), null;
- (n = t.matchPattern(/^[a-zA-Z_$][a-zA-Z_$0-9\-]*/)),
+ if (!t.matchPattern(Zf)) return ((t.pos = e), null);
+ ((n = t.matchPattern(/^[a-zA-Z_$][a-zA-Z_$0-9\-]*/)),
n || t.error('expected legal partial name'),
t.matchString(o[1]) ||
t.error("Expected closing delimiter '" + o[1] + "'"),
- (i = []);
+ (i = []));
do
(r = Ul(t, {
open: t.standardDelimiters[0],
@@ -1987,7 +1987,7 @@
: t.error('Unexpected template content');
}
var u = { v: oa, t: e };
- return i && (u.p = n), u;
+ return (i && (u.p = n), u);
}
function Ze(t, e) {
return new Xf(t, e || {}).result;
@@ -2040,7 +2040,7 @@
return (
t.defaults && (t = t.defaults),
sd.reduce(function (e, n) {
- return (e[n] = t[n]), e;
+ return ((e[n] = t[n]), e);
}, {})
);
}
@@ -2068,7 +2068,7 @@
}
function rn(t, e) {
if ('string' == typeof t)
- '#' === t[0] && (t = ad.fromId(t)), (t = Kf(t, ad.getParseOptions(e)));
+ ('#' === t[0] && (t = ad.fromId(t)), (t = Kf(t, ad.getParseOptions(e))));
else {
if (void 0 == t) throw new Error('The template cannot be ' + t + '.');
if ('number' != typeof t.v)
@@ -2103,7 +2103,7 @@
t
);
};
- return (i._parent = t), (i._method = n), i;
+ return ((i._parent = t), (i._method = n), i);
}
function an(t, e) {
var n, i;
@@ -2135,15 +2135,15 @@
function hn(t, e, n) {
if (e in t) {
if (n in t) throw new Error(un(e, n, !0));
- m(un(e, n)), (t[n] = t[e]);
+ (m(un(e, n)), (t[n] = t[e]));
}
}
function cn(t) {
- hn(t, 'beforeInit', 'onconstruct'),
+ (hn(t, 'beforeInit', 'onconstruct'),
hn(t, 'init', 'onrender'),
hn(t, 'complete', 'oncomplete'),
hn(t, 'eventDefinitions', 'events'),
- s(t.adaptors) && hn(t, 'adaptors', 'adapt');
+ s(t.adaptors) && hn(t, 'adaptors', 'adapt'));
}
function ln(t, e, n, i) {
yd(i);
@@ -2159,19 +2159,19 @@
)
: (n[r] = s);
}
- vd.forEach(function (r) {
+ (vd.forEach(function (r) {
r[t](e, n, i);
}),
Th[t](e, n, i),
hd[t](e, n, i),
Mh[t](e, n, i),
- fn(e.prototype, n, i);
+ fn(e.prototype, n, i));
}
function fn(t, e, n) {
for (var i in n)
if (!pd[i] && n.hasOwnProperty(i)) {
var r = n[i];
- 'function' == typeof r && (r = gd(t, i, r)), (e[i] = r);
+ ('function' == typeof r && (r = gd(t, i, r)), (e[i] = r));
}
}
function dn(t) {
@@ -2184,10 +2184,10 @@
);
}
function pn() {
- (this.dirtyValue = this.dirtyArgs = !0),
+ ((this.dirtyValue = this.dirtyArgs = !0),
this.bound &&
'function' == typeof this.owner.bubble &&
- this.owner.bubble();
+ this.owner.bubble());
}
function mn() {
var t;
@@ -2212,14 +2212,14 @@
var n, i, r;
if (this.items)
for (i = this.items.length, n = 0; i > n; n += 1)
- (r = this.items[n]), r.findAll && r.findAll(t, e);
+ ((r = this.items[n]), r.findAll && r.findAll(t, e));
return e;
}
function yn(t, e) {
var n, i, r;
if (this.items)
for (i = this.items.length, n = 0; i > n; n += 1)
- (r = this.items[n]), r.findAllComponents && r.findAllComponents(t, e);
+ ((r = this.items[n]), r.findAllComponents && r.findAllComponents(t, e));
return e;
}
function bn(t) {
@@ -2301,8 +2301,8 @@
);
}
function Sn() {
- this.registered && this.root.viewmodel.unregister(this.keypath, this),
- this.resolver && this.resolver.unbind();
+ (this.registered && this.root.viewmodel.unregister(this.keypath, this),
+ this.resolver && this.resolver.unbind());
}
function Cn() {
return this.value;
@@ -2322,11 +2322,11 @@
for (e || (a.refs = n = {}); t; ) {
if ((o = t.owner) && (i = o.indexRefs)) {
if (e && (r = o.getIndexRef(e)))
- return (a.ref = { fragment: t, ref: r }), a;
+ return ((a.ref = { fragment: t, ref: r }), a);
if (!e)
for (s in i)
- (r = i[s]),
- n[r.n] || ((u = !0), (n[r.n] = { fragment: t, ref: r }));
+ ((r = i[s]),
+ n[r.n] || ((u = !0), (n[r.n] = { fragment: t, ref: r })));
}
!t.parent &&
t.owner &&
@@ -2350,7 +2350,11 @@
var n, i;
if (Hd[t]) return Hd[t];
for (i = []; e--; ) i[e] = '_' + e;
- return (n = new Function(i.join(','), 'return(' + t + ')')), (Hd[t] = n), n;
+ return (
+ (n = new Function(i.join(','), 'return(' + t + ')')),
+ (Hd[t] = n),
+ n
+ );
}
function Rn(t) {
return t.call();
@@ -2381,9 +2385,9 @@
if (/this/.test(t.toString())) {
xa(t, i, { value: Kd.call(t, e), configurable: !0 });
for (r in t) t.hasOwnProperty(r) && (t[i][r] = t[r]);
- return e._boundFunctions.push({ fn: t, prop: i }), t[i];
+ return (e._boundFunctions.push({ fn: t, prop: i }), t[i]);
}
- return xa(t, '__ractive_nowrap', { value: t }), t.__ractive_nowrap;
+ return (xa(t, '__ractive_nowrap', { value: t }), t.__ractive_nowrap);
}
function Ln(t) {
return t.value;
@@ -2409,7 +2413,7 @@
}));
}
var r, s, o;
- (s = e.parentFragment),
+ ((s = e.parentFragment),
(o = e.template),
(t.root = s.root),
(t.parentFragment = s),
@@ -2422,7 +2426,7 @@
(r = o.r) && (t.resolver = Qd(t, r, n)),
e.template.x && (t.resolver = new Gd(t, s, e.template.x, i)),
e.template.rx && (t.resolver = new tp(t, e.template.rx, i)),
- t.template.n !== Sc || t.hasOwnProperty('value') || t.setValue(void 0);
+ t.template.n !== Sc || t.hasOwnProperty('value') || t.setValue(void 0));
}
function Wn(t) {
var e, n, i;
@@ -2441,11 +2445,11 @@
void (e && (i = this.twowayBinding) && i.rebound()));
}
function zn(t, e) {
- this.fragments &&
+ (this.fragments &&
this.fragments.forEach(function (n) {
return n.rebind(t, e);
}),
- this.resolver && this.resolver.rebind(t, e);
+ this.resolver && this.resolver.rebind(t, e));
}
function Bn() {
this.parentFragment.bubble();
@@ -2541,9 +2545,9 @@
r > i;
i += 1
)
- (a = s[i]),
+ ((a = s[i]),
a || this.fragmentsToCreate.push(i),
- (this.fragments[i] = a);
+ (this.fragments[i] = a));
}
}
function Jn(t) {
@@ -2580,10 +2584,10 @@
}),
this.fragmentsToCreate.forEach(function (t) {
var e;
- (n.context = i.keypath.join(t)),
+ ((n.context = i.keypath.join(t)),
(n.index = t),
(e = new yb(n)),
- i.fragmentsToRender.push((i.fragments[t] = e));
+ i.fragmentsToRender.push((i.fragments[t] = e)));
}),
(this.fragmentsToCreate.length = 0))
: ni(this, t) && (this.bubble(), this.rendered && mu.addView(this)),
@@ -2593,14 +2597,14 @@
function ei(t, e, n) {
if (e === Cc && t.indexRefs && t.indexRefs[0]) {
var i = t.indexRefs[0];
- ((n && 'i' === i.t) || (!n && 'k' === i.t)) &&
+ (((n && 'i' === i.t) || (!n && 'k' === i.t)) &&
(n ||
((t.length = 0),
(t.fragmentsToUnrender = t.fragments.slice(0)),
t.fragmentsToUnrender.forEach(function (t) {
return t.unbind();
}))),
- (i.t = n ? 'k' : 'i');
+ (i.t = n ? 'k' : 'i'));
}
t.currentSubtype = e;
}
@@ -2614,15 +2618,15 @@
if (((t.hasContext = !0), t.subtype))
switch (t.subtype) {
case Ac:
- return (t.hasContext = !1), ai(t, e, !1, n);
+ return ((t.hasContext = !1), ai(t, e, !1, n));
case Sc:
- return (t.hasContext = !1), ai(t, e, !0, n);
+ return ((t.hasContext = !1), ai(t, e, !0, n));
case Oc:
return oi(t, n);
case Pc:
return si(t, e, n);
case Cc:
- if (h(e)) return ei(t, t.subtype, !0), ri(t, e, n);
+ if (h(e)) return (ei(t, t.subtype, !0), ri(t, e, n));
}
return (
(t.ordered = !!o(e)),
@@ -2639,30 +2643,30 @@
var i, r, s;
if (((r = e.length), r === t.length)) return !1;
if (r < t.length)
- (t.fragmentsToUnrender = t.fragments.splice(r, t.length - r)),
- t.fragmentsToUnrender.forEach(Z);
+ ((t.fragmentsToUnrender = t.fragments.splice(r, t.length - r)),
+ t.fragmentsToUnrender.forEach(Z));
else if (r > t.length)
for (i = t.length; r > i; i += 1)
- (n.context = t.keypath.join(i)),
+ ((n.context = t.keypath.join(i)),
(n.index = i),
(s = new yb(n)),
- t.fragmentsToRender.push((t.fragments[i] = s));
- return (t.length = r), !0;
+ t.fragmentsToRender.push((t.fragments[i] = s)));
+ return ((t.length = r), !0);
}
function ri(t, e, n) {
var i, r, s, o, a, u;
for (s = t.hasKey || (t.hasKey = {}), r = t.fragments.length; r--; )
- (o = t.fragments[r]),
+ ((o = t.fragments[r]),
o.key in e ||
((a = !0),
o.unbind(),
t.fragmentsToUnrender.push(o),
t.fragments.splice(r, 1),
- (s[o.key] = !1));
+ (s[o.key] = !1)));
for (r = t.fragments.length; r--; )
- (o = t.fragments[r]),
+ ((o = t.fragments[r]),
o.index !== r &&
- ((o.index = r), (u = o.registeredIndexRefs) && u.forEach(ci));
+ ((o.index = r), (u = o.registeredIndexRefs) && u.forEach(ci)));
r = t.fragments.length;
for (i in e)
s[i] ||
@@ -2674,7 +2678,7 @@
t.fragmentsToRender.push(o),
t.fragments.push(o),
(s[i] = !0));
- return (t.length = t.fragments.length), a;
+ return ((t.length = t.fragments.length), a);
}
function si(t, e, n) {
return e ? oi(t, n) : ui(t);
@@ -2740,19 +2744,19 @@
}
function fi() {
var t = this;
- this.fragments.forEach(Z),
+ (this.fragments.forEach(Z),
this.fragmentsToRender.forEach(function (e) {
return I(t.fragments, e);
}),
(this.fragmentsToRender = []),
Dd.call(this),
(this.length = 0),
- (this.unbound = !0);
+ (this.unbound = !0));
}
function di(t) {
- this.fragments.forEach(t ? pi : mi),
+ (this.fragments.forEach(t ? pi : mi),
(this.renderedFragments = []),
- (this.rendered = !1);
+ (this.rendered = !1));
}
function pi(t) {
t.unrender(!0);
@@ -2763,7 +2767,7 @@
function vi() {
var t, e, n, i, r, s, o;
for (n = this.renderedFragments; (t = this.fragmentsToUnrender.pop()); )
- t.unrender(!0), n.splice(n.indexOf(t), 1);
+ (t.unrender(!0), n.splice(n.indexOf(t), 1));
for (; (t = this.fragmentsToRender.shift()); ) t.render();
for (
this.rendered && (r = this.parentFragment.getNode()),
@@ -2772,19 +2776,19 @@
o > s;
s += 1
)
- (t = this.fragments[s]),
+ ((t = this.fragments[s]),
(e = n.indexOf(t, s)),
e !== s
? (this.docFrag.appendChild(t.detach()),
-1 !== e && n.splice(e, 1),
n.splice(s, 0, t))
: this.docFrag.childNodes.length &&
- ((i = t.firstNode()), r.insertBefore(this.docFrag, i));
- this.rendered &&
+ ((i = t.firstNode()), r.insertBefore(this.docFrag, i)));
+ (this.rendered &&
this.docFrag.childNodes.length &&
((i = this.parentFragment.findNextNode(this)),
r.insertBefore(this.docFrag, i)),
- (this.renderedFragments = this.fragments.slice());
+ (this.renderedFragments = this.fragments.slice()));
}
function gi() {
var t, e;
@@ -2855,11 +2859,11 @@
}
function Ai(t) {
var e;
- (e = this.root.viewmodel.wrapped[this.keypath.str]) && (t = e.get()),
+ ((e = this.root.viewmodel.wrapped[this.keypath.str]) && (t = e.get()),
t !== this.value &&
((this.value = t),
this.parentFragment.bubble(),
- this.rendered && mu.addView(this));
+ this.rendered && mu.addView(this)));
}
function Si() {
return void 0 != this.value ? _e('' + this.value) : '';
@@ -2871,11 +2875,11 @@
var t, e;
if (this.rendered) {
for (; this.nodes && this.nodes.length; )
- (t = this.nodes.pop()), t.parentNode.removeChild(t);
- (e = this.parentFragment.getNode()),
+ ((t = this.nodes.pop()), t.parentNode.removeChild(t));
+ ((e = this.parentFragment.getNode()),
(this.nodes = Rp(this.value, e, this.docFrag)),
e.insertBefore(this.docFrag, this.parentFragment.findNextNode(this)),
- jp(this.pElement);
+ jp(this.pElement));
}
}
function Pi() {
@@ -2936,14 +2940,14 @@
}
function Li(t) {
var e;
- (this.node = t),
+ ((this.node = t),
(t.namespaceURI && t.namespaceURI !== ia.html) ||
((e = cm[this.name] || this.name),
void 0 !== t[e] && (this.propertyName = e),
(this.isBoolean || this.isTwoway) && (this.useProperty = !0),
'value' === e && (t._ractive.value = this.value)),
(this.rendered = !0),
- this.update();
+ this.update());
}
function Vi() {
var t = this,
@@ -2964,7 +2968,7 @@
if (1 === s.items.length && null == s.items[0].value) return '';
i = s.toString();
}
- return n && (e = n + ':' + e), i ? e + '="' + Mi(i) + '"' : e;
+ return (n && (e = n + ':' + e), i ? e + '="' + Mi(i) + '"' : e);
}
}
function Mi(t) {
@@ -2974,8 +2978,8 @@
.replace(/'/g, ''');
}
function Ui() {
- this.fragment && this.fragment.unbind(),
- 'id' === this.name && delete this.root.nodes[this.value];
+ (this.fragment && this.fragment.unbind(),
+ 'id' === this.name && delete this.root.nodes[this.value]);
}
function Wi() {
var t,
@@ -3003,9 +3007,9 @@
i,
r = this.value;
for (s(r) || (r = [r]), t = this.node.options, e = t.length; e--; )
- (n = t[e]),
+ ((n = t[e]),
(i = n._ractive ? n._ractive.value : n.value),
- (n.selected = R(r, i));
+ (n.selected = R(r, i)));
}
function Bi() {
var t = this,
@@ -3033,7 +3037,7 @@
for (; i--; ) {
if (((e = n[i]), !e.element.node)) return;
if (e.element.node.checked)
- return mu.addRactive(e.root), e.handleChange();
+ return (mu.addRactive(e.root), e.handleChange());
}
this.root.viewmodel.set(e.keypath, void 0);
}
@@ -3059,24 +3063,24 @@
var t = this,
e = t.node,
n = t.value;
- (this.root.nodes[n] = e), (e.id = n);
+ ((this.root.nodes[n] = e), (e.id = n));
}
function Hi() {
var t, e;
- (t = this.node),
+ ((t = this.node),
(e = this.value),
void 0 === e && (e = ''),
- t.style.setAttribute('cssText', e);
+ t.style.setAttribute('cssText', e));
}
function Ki() {
var t = this.value;
- void 0 === t && (t = ''), this.locked || (this.node.innerHTML = t);
+ (void 0 === t && (t = ''), this.locked || (this.node.innerHTML = t));
}
function Gi() {
var t = this,
e = t.node,
n = t.value;
- (e._ractive.value = n), this.locked || (e.value = void 0 == n ? '' : n);
+ ((e._ractive.value = n), this.locked || (e.value = void 0 == n ? '' : n));
}
function Yi() {
this.locked || (this.node[this.propertyName] = this.value);
@@ -3105,7 +3109,7 @@
i = n.name,
r = n.element,
s = n.node;
- 'id' === i
+ ('id' === i
? (e = bm)
: 'value' === i
? 'select' === r.name && 'value' === i
@@ -3133,7 +3137,7 @@
: (e = ym),
e || (e = _m),
(this.update = e),
- this.update();
+ this.update());
}
function tr(t, e) {
var n = e ? 'svg' : 'div';
@@ -3154,17 +3158,17 @@
}
function rr() {
var t;
- Im.call(this),
+ (Im.call(this),
(t = this._ractive.root.viewmodel.get(this._ractive.binding.keypath)),
- (this.value = void 0 == t ? '' : t);
+ (this.value = void 0 == t ? '' : t));
}
function sr() {
var t = this._ractive.binding,
e = this;
- t._timeout && clearTimeout(t._timeout),
+ (t._timeout && clearTimeout(t._timeout),
(t._timeout = setTimeout(function () {
- t.rendered && Im.call(e), (t._timeout = void 0);
- }, t.element.lazy));
+ (t.rendered && Im.call(e), (t._timeout = void 0));
+ }, t.element.lazy)));
}
function or(t, e, n) {
var i = t + e + n;
@@ -3233,7 +3237,7 @@
r,
s,
o = this;
- (this.element = t),
+ ((this.element = t),
(this.root = t.root),
(this.parentFragment = t.parentFragment),
(this.name = e),
@@ -3277,7 +3281,7 @@
owner: this.element,
})),
(this.fire = gr))
- : n.a && ((this.params = n.a), (this.fire = vr)));
+ : n.a && ((this.params = n.a), (this.fire = vr))));
}
function mr(t) {
var e, n, i;
@@ -3285,7 +3289,7 @@
throw new Error(
'Attempted to call a non-existent method ("' + this.method + '")'
);
- (n = this.keypaths.map(function (n) {
+ ((n = this.keypaths.map(function (n) {
var i, r, s;
if (void 0 === n) return void 0;
if (n.eventObject) {
@@ -3297,22 +3301,22 @@
Uu.enqueue(e, t),
(i = this.fn.apply(null, n)),
e[this.method].apply(e, i),
- Uu.dequeue(e);
+ Uu.dequeue(e));
}
function vr(t) {
Wu(this.root, this.getAction(), { event: t, args: this.params });
}
function gr(t) {
var e = this.dynamicParams.getArgsList();
- 'string' == typeof e && (e = e.substr(1, e.length - 2)),
- Wu(this.root, this.getAction(), { event: t, args: e });
+ ('string' == typeof e && (e = e.substr(1, e.length - 2)),
+ Wu(this.root, this.getAction(), { event: t, args: e }));
}
function yr(t) {
var e,
n,
i,
r = {};
- (e = this._ractive),
+ ((e = this._ractive),
(n = e.events[t.type]),
(i = qd(n.element.parentFragment)) && (r = qd.resolve(i)),
n.fire({
@@ -3321,7 +3325,7 @@
index: r,
keypath: e.keypath.str,
context: e.root.viewmodel.get(e.keypath),
- });
+ }));
}
function br() {
var t,
@@ -3341,10 +3345,10 @@
lv[t] ||
(lv[t] = function (e) {
var n = e.node._ractive;
- (e.index = n.index),
+ ((e.index = n.index),
(e.keypath = n.keypath.str),
(e.context = n.root.viewmodel.get(n.keypath)),
- n.events[t].fire(e);
+ n.events[t].fire(e));
}),
lv[t]
);
@@ -3360,9 +3364,9 @@
void (this.dynamicParams && n(this.dynamicParams)));
}
function kr() {
- (this.node = this.element.node),
+ ((this.node = this.element.node),
(this.node._ractive.events[this.name] = this),
- (this.method || this.getAction()) && this.listen();
+ (this.method || this.getAction()) && this.listen());
}
function Er(t, e) {
this.keypaths[t] = e;
@@ -3374,23 +3378,23 @@
void (this.dynamicParams && this.dynamicParams.unbind()));
}
function Ar() {
- this.custom
+ (this.custom
? this.custom.teardown()
: this.node.removeEventListener(this.name, hv, !1),
- (this.hasListener = !1);
+ (this.hasListener = !1));
}
function Sr() {
var t = this;
- this.dirty ||
+ (this.dirty ||
((this.dirty = !0),
mu.scheduleTask(function () {
- Cr(t), (t.dirty = !1);
+ (Cr(t), (t.dirty = !1));
})),
- this.parentFragment.bubble();
+ this.parentFragment.bubble());
}
function Cr(t) {
var e, n, i, r, s;
- (e = t.node),
+ ((e = t.node),
e &&
((r = L(e.options)),
(n = t.getAttribute('value')),
@@ -3398,21 +3402,21 @@
void 0 !== n
? (r.forEach(function (t) {
var e, r;
- (e = t._ractive ? t._ractive.value : t.value),
+ ((e = t._ractive ? t._ractive.value : t.value),
(r = i ? Or(n, e) : n == e),
r && (s = !0),
- (t.selected = r);
+ (t.selected = r));
}),
s ||
(r[0] && (r[0].selected = !0),
t.binding && t.binding.forceUpdate()))
- : t.binding && t.binding.forceUpdate());
+ : t.binding && t.binding.forceUpdate()));
}
function Or(t, e) {
for (var n = t.length; n--; ) if (t[n] == e) return !0;
}
function Pr(t, e) {
- (t.select = Fr(t.parent)),
+ ((t.select = Fr(t.parent)),
t.select &&
(t.select.options.push(t),
e.a || (e.a = {}),
@@ -3421,7 +3425,7 @@
(e.a.value = e.f),
'selected' in e.a &&
void 0 !== t.select.getAttribute('value') &&
- delete e.a.selected);
+ delete e.a.selected));
}
function Tr(t) {
t.select && I(t.select.options, t);
@@ -3433,7 +3437,7 @@
}
function Rr(t) {
var e, n, i, r, s, o, a;
- (this.type = Xh),
+ ((this.type = Xh),
(e = this.parentFragment = t.parentFragment),
(n = this.template = t.template),
(this.parent = t.pElement || e.pElement),
@@ -3469,7 +3473,7 @@
n.v && (this.eventHandlers = wv(this, n.v)),
n.o && (this.decorator = new Av(this, n.o)),
(this.intro = n.t0 || n.t1),
- (this.outro = n.t0 || n.t2);
+ (this.outro = n.t0 || n.t2));
}
function jr(t, e) {
function n(n) {
@@ -3495,9 +3499,9 @@
(e = function () {
var n = t.getAttribute('width'),
i = t.getAttribute('height');
- void 0 !== n && t.node.setAttribute('width', n),
+ (void 0 !== n && t.node.setAttribute('width', n),
void 0 !== i && t.node.setAttribute('height', i),
- t.node.removeEventListener('load', e, !1);
+ t.node.removeEventListener('load', e, !1));
}),
!1
);
@@ -3510,14 +3514,14 @@
}
function Lr() {
var t = this._ractive.proxy;
- mu.start(), t.formBindings.forEach(Vr), mu.end();
+ (mu.start(), t.formBindings.forEach(Vr), mu.end());
}
function Vr(t) {
t.root.viewmodel.set(t.keypath, t.resetValue);
}
function Mr(t, e, n) {
var i, r, s;
- (this.element = t),
+ ((this.element = t),
(this.root = i = t.root),
(this.isIntro = n),
(r = e.n || e),
@@ -3534,7 +3538,7 @@
(this.params = s.getArgsList()),
s.unbind()),
(this._fn = g('transitions', i, r)),
- this._fn || v(Da(r, 'transition'), { ractive: this.root }));
+ this._fn || v(Da(r, 'transition'), { ractive: this.root })));
}
function Ur(t) {
return t;
@@ -3679,9 +3683,9 @@
e = t.root;
do
for (n = e._liveQueries, i = n.length; i--; )
- (r = n[i]),
+ ((r = n[i]),
(s = n['_' + r]),
- s._test(t) && (t.liveQueries || (t.liveQueries = [])).push(s);
+ s._test(t) && (t.liveQueries || (t.liveQueries = [])).push(s));
while ((e = e.parent));
}
function Gr(t) {
@@ -3712,16 +3716,16 @@
return e ? ' ' + e : '';
}
function Xr() {
- this.fragment && this.fragment.unbind(),
+ (this.fragment && this.fragment.unbind(),
this.binding && this.binding.unbind(),
this.eventHandlers && this.eventHandlers.forEach(Z),
'option' === this.name && Tr(this),
this.attributes.forEach(Z),
- this.conditionalAttributes.forEach(Z);
+ this.conditionalAttributes.forEach(Z));
}
function ts(t) {
var e, n, i;
- (i = this.transition) && i.complete(),
+ ((i = this.transition) && i.complete(),
'option' === this.name ? this.detach() : t && mu.detachWhenReady(this),
this.fragment && this.fragment.unrender(!1),
(e = this.binding) &&
@@ -3739,12 +3743,12 @@
return i.start();
})),
this.liveQueries && es(this),
- 'form' === this.name && Ir(this);
+ 'form' === this.name && Ir(this));
}
function es(t) {
var e, n, i;
for (i = t.liveQueries.length; i--; )
- (e = t.liveQueries[i]), (n = e.selector), e._remove(t.node);
+ ((e = t.liveQueries[i]), (n = e.selector), e._remove(t.node));
}
function ns(t, e) {
var n = xg.exec(e)[0];
@@ -3783,7 +3787,7 @@
var a = i ? s : ss(s, e);
a.partials[e] = r = o.t;
}
- return i && (r._fn = i), r.v ? r.t : r;
+ return (i && (r._fn = i), r.v ? r.t : r);
}
}
function ss(t, e) {
@@ -3806,15 +3810,15 @@
var r = n.bind(i);
if (((r.isOwner = i.components.hasOwnProperty(e)), (n = r()), !n))
return void m(Na, e, 'component', 'component', { ractive: t });
- 'string' == typeof n && (n = us(t, n)),
+ ('string' == typeof n && (n = us(t, n)),
(n._fn = r),
- (i.components[e] = n);
+ (i.components[e] = n));
}
return n;
}
function hs() {
var t = this.instance.fragment.detach();
- return jg.fire(this.instance), t;
+ return (jg.fire(this.instance), t);
}
function cs(t) {
return this.instance.fragment.find(t);
@@ -3823,8 +3827,8 @@
return this.instance.fragment.findAll(t, e);
}
function fs(t, e) {
- e._test(this, !0),
- this.instance.fragment && this.instance.fragment.findAllComponents(t, e);
+ (e._test(this, !0),
+ this.instance.fragment && this.instance.fragment.findAllComponents(t, e));
}
function ds(t) {
return t && t !== this.name
@@ -3842,7 +3846,7 @@
function vs(t, e, n) {
function i(t) {
var n, i;
- (t.value = e),
+ ((t.value = e),
t.updating ||
((i = t.ractive),
(n = t.keypath),
@@ -3850,7 +3854,7 @@
mu.start(i),
i.viewmodel.mark(n),
mu.end(),
- (t.updating = !1));
+ (t.updating = !1)));
}
var r, s, o, a, u, h;
if (((r = t.obj), (s = t.prop), n && !n.configurable)) {
@@ -3861,14 +3865,14 @@
'" - object is not configurable'
);
}
- n && ((o = n.get), (a = n.set)),
+ (n && ((o = n.get), (a = n.set)),
(u =
o ||
function () {
return e;
}),
(h = function (t) {
- a && a(t), (e = o ? o() : t), h._ractiveWrappers.forEach(i);
+ (a && a(t), (e = o ? o() : t), h._ractiveWrappers.forEach(i));
}),
(h._ractiveWrappers = [t]),
Object.defineProperty(r, s, {
@@ -3876,7 +3880,7 @@
set: h,
enumerable: !0,
configurable: !0,
- });
+ }));
}
function gs(t, e) {
var n, i, r, s;
@@ -3920,27 +3924,27 @@
i = [Za];
for (e = t.length; e--; )
for (n = t[e].parent; n && !n.isRoot; )
- -1 === t.indexOf(n) && F(i, n), (n = n.parent);
+ (-1 === t.indexOf(n) && F(i, n), (n = n.parent));
return i;
}
function xs(t, e, n) {
var i;
- Es(t, e),
+ (Es(t, e),
n ||
((i = e.wildcardMatches()),
i.forEach(function (n) {
ks(t, n, e);
- }));
+ })));
}
function ks(t, e, n) {
var i, r, s;
- (e = e.str || e),
+ ((e = e.str || e),
(i = t.depsMap.patternObservers),
(r = i && i[e]),
r &&
r.forEach(function (e) {
- (s = n.join(e.lastKey)), Es(t, s), ks(t, e, s);
- });
+ ((s = n.join(e.lastKey)), Es(t, s), ks(t, e, s));
+ }));
}
function Es(t, e) {
t.patternObservers.forEach(function (t) {
@@ -4020,14 +4024,14 @@
i = !0;
break;
}
- a.slice(0, e.keypath.length) === e.keypath && o.push(a), r++;
+ (a.slice(0, e.keypath.length) === e.keypath && o.push(a), r++);
}
- i && e.setValue(t.get(e.keypath)), o.length && e.refineValue(o);
+ (i && e.setValue(t.get(e.keypath)), o.length && e.refineValue(o));
});
}
function Cs(t, e, n) {
function i(t) {
- t.forEach(r), t.forEach(s);
+ (t.forEach(r), t.forEach(s));
}
function r(e) {
var i = Os(t, e, n);
@@ -4044,7 +4048,7 @@
});
}
var a = [];
- i(e), a.forEach(o);
+ (i(e), a.forEach(o));
}
function Os(t, e, n) {
var i = t.deps[n];
@@ -4071,7 +4075,7 @@
}
function Rs(t, e) {
var n = new fy(t, e);
- return this.ready && n.init(this), (this.computations[t.str] = n);
+ return (this.ready && n.init(this), (this.computations[t.str] = n));
}
function js(t, e) {
var n,
@@ -4129,35 +4133,35 @@
}
function Is(t, e) {
var n = (this.mappings[t.str] = new by(t, e));
- return n.initViewmodel(this), n;
+ return (n.initViewmodel(this), n);
}
function Ls(t, e) {
var n,
i = t.str;
- e &&
+ (e &&
(e.implicit && (this.implicitChanges[i] = !0),
e.noCascade && (this.noCascade[i] = !0)),
(n = this.computations[i]) && n.invalidate(),
- -1 === this.changes.indexOf(t) && this.changes.push(t);
+ -1 === this.changes.indexOf(t) && this.changes.push(t));
var r = e ? e.keepExistingWrapper : !1;
- this.clearCache(i, r), this.ready && this.onchange();
+ (this.clearCache(i, r), this.ready && this.onchange());
}
function Vs(t, e, n, i) {
var r, s, o, a;
if ((this.mark(t), i && i.compare)) {
o = Us(i.compare);
try {
- (r = e.map(o)), (s = n.map(o));
+ ((r = e.map(o)), (s = n.map(o)));
} catch (u) {
- m(
+ (m(
'merge(): "%s" comparison failed. Falling back to identity checking',
t
),
(r = e),
- (s = n);
+ (s = n));
}
- } else (r = e), (s = n);
- (a = xy(r, s)), this.smartUpdate(t, n, a, e.length !== n.length);
+ } else ((r = e), (s = n));
+ ((a = xy(r, s)), this.smartUpdate(t, n, a, e.length !== n.length));
}
function Ms(t) {
return JSON.stringify(t);
@@ -4193,18 +4197,18 @@
}
function zs(t, e, n) {
for (var i, r, s; !e.isRoot; )
- (i = t.depsMap[n]),
+ ((i = t.depsMap[n]),
(r = i[e.parent.str] || (i[e.parent.str] = [])),
(s = e.str),
void 0 === r['_' + s] && ((r['_' + s] = 0), r.push(e)),
(r['_' + s] += 1),
- (e = e.parent);
+ (e = e.parent));
}
function Bs() {
return this.captureGroups.pop();
}
function qs(t) {
- (this.data = t), this.clearCache('');
+ ((this.data = t), this.clearCache(''));
}
function $s(t, e) {
var n,
@@ -4215,7 +4219,7 @@
if (!o.noMapping && (n = this.mappings[t.firstKey])) return n.set(t, e);
if ((i = this.computations[t.str])) {
if (i.setting) return;
- i.set(e), (e = i.get());
+ (i.set(e), (e = i.get()));
}
a(this.cache[t.str], e) ||
((r = this.wrapped[t.str]),
@@ -4225,17 +4229,17 @@
}
function Qs(t, e, n) {
var i, r, s, o;
- (s = function () {
+ ((s = function () {
i.set ? i.set(e.lastKey, n) : ((r = i.get()), o());
}),
(o = function () {
- r || ((r = Yg(e.lastKey)), t.set(e.parent, r, { silent: !0 })),
- (r[e.lastKey] = n);
+ (r || ((r = Yg(e.lastKey)), t.set(e.parent, r, { silent: !0 })),
+ (r[e.lastKey] = n));
}),
(i = t.wrapped[e.parent.str]),
i
? s()
- : ((r = t.get(e.parent)), (i = t.wrapped[e.parent.str]) ? s() : o());
+ : ((r = t.get(e.parent)), (i = t.wrapped[e.parent.str]) ? s() : o()));
}
function Zs(t, e, n) {
var i,
@@ -4289,19 +4293,19 @@
throw new Error(
'Attempted to remove a dependant that was no longer registered! This should not happen. If you are seeing this bug in development please raise an issue at https://github.com/RactiveJS/Ractive/issues - thanks'
);
- i.splice(r, 1), t.isRoot || Ys(this, t, s);
+ (i.splice(r, 1), t.isRoot || Ys(this, t, s));
}
}
function Ys(t, e, n) {
for (var i, r; !e.isRoot; )
- (i = t.depsMap[n]),
+ ((i = t.depsMap[n]),
(r = i[e.parent.str]),
(r['_' + e.str] -= 1),
r['_' + e.str] || (I(r, e), (r['_' + e.str] = void 0)),
- (e = e.parent);
+ (e = e.parent));
}
function Js(t) {
- (this.hook = new nu(t)), (this.inProcess = {}), (this.queue = {});
+ ((this.hook = new nu(t)), (this.inProcess = {}), (this.queue = {}));
}
function Xs(t, e) {
return t[e._guid] || (t[e._guid] = []);
@@ -4338,7 +4342,7 @@
(n =
'return (' +
e.replace(Ly, function (t, e) {
- return (i = !0), '__ractive.get("' + e + '")';
+ return ((i = !0), '__ractive.get("' + e + '")');
}) +
');'),
i && (n = 'var __ractive = this; ' + n),
@@ -4380,26 +4384,26 @@
e.template)
) {
var a = void 0;
- (o.cssIds || e.cssId) &&
+ ((o.cssIds || e.cssId) &&
((a = o.cssIds ? o.cssIds.slice() : []), e.cssId && a.push(e.cssId)),
(e.fragment = new yb({
template: e.template,
root: e,
owner: e,
cssIds: a,
- }));
+ })));
}
if ((Uy.end(e), (n = t(e.el)))) {
var u = e.render(n, e.append);
Qb.DEBUG_PROMISES &&
u['catch'](function (t) {
throw (
- (v(
+ v(
'Promise debugging is enabled, to help solve errors that happen asynchronously. Some browsers will log unhandled promise rejections, in which case you can safely disable promise debugging:\n Ractive.DEBUG_PROMISES = false;'
),
m('An error happened during rendering', { ractive: e }),
t.stack && f(t.stack),
- t)
+ t
);
});
}
@@ -4425,9 +4429,9 @@
throw new Error(
'Getters and setters (magic mode) are not supported in this browser'
);
- o && r.push(ey), r.push(ty);
+ (o && r.push(ey), r.push(ty));
}
- return o && r.push(Kg), r;
+ return (o && r.push(Kg), r);
}
function ao(t, e) {
for (var n = t.slice(), i = e.length; i--; )
@@ -4435,7 +4439,7 @@
return n;
}
function uo(t, e) {
- (t._guid = 'r-' + Wy++),
+ ((t._guid = 'r-' + Wy++),
(t._subs = wa(null)),
(t._config = {}),
(t._twowayBindings = wa(null)),
@@ -4452,7 +4456,7 @@
(t.component = e.component),
(e.component.instance = t),
(t._inlinePartials = e.inlinePartials))
- : ((t.root = t), (t.parent = t.container = null));
+ : ((t.root = t), (t.parent = t.container = null)));
}
function ho() {
throw new Error(
@@ -4460,10 +4464,10 @@
);
}
function co(t, e, n) {
- (this.parentFragment = t.parentFragment),
+ ((this.parentFragment = t.parentFragment),
(this.callback = n),
(this.fragment = new yb({ template: e, root: t.root, owner: this })),
- this.update();
+ this.update());
}
function lo(t, e, n) {
var i;
@@ -4484,7 +4488,7 @@
for (n in e) e.hasOwnProperty(n) && mo(t.instance, t.root, n, e[n]);
}
function mo(t, e, n, i) {
- 'string' != typeof i &&
+ ('string' != typeof i &&
l(
'Components currently only support simple events - you cannot include arguments. Sorry!'
),
@@ -4499,12 +4503,12 @@
Wu(e, i, { event: t, args: n }),
!1
);
- });
+ }));
}
function vo(t, e) {
var n, i;
if (!e) throw new Error('Component "' + this.name + '" not found');
- (n = this.parentFragment = t.parentFragment),
+ ((n = this.parentFragment = t.parentFragment),
(i = n.root),
(this.root = i),
(this.type = sc),
@@ -4520,7 +4524,7 @@
'The "intro", "outro" and "decorator" directives have no effect on components',
{ ractive: this.instance }
),
- Zy(this);
+ Zy(this));
}
function go(t, e) {
function n(n) {
@@ -4544,7 +4548,7 @@
}
function wo() {
var t = this.instance;
- this.resolvers.forEach(Z),
+ (this.resolvers.forEach(Z),
xo(this),
t._observers.forEach(K),
t.fragment.unbind(),
@@ -4552,7 +4556,7 @@
t.fragment.rendered &&
t.el.__ractive_instances__ &&
I(t.el.__ractive_instances__, t),
- Xy.fire(t);
+ Xy.fire(t));
}
function xo(t) {
var e, n;
@@ -4561,11 +4565,11 @@
while ((e = e.parent));
}
function ko(t) {
- (this.shouldDestroy = t), this.instance.unrender();
+ ((this.shouldDestroy = t), this.instance.unrender());
}
function Eo(t) {
var e = this;
- (this.owner = t.owner),
+ ((this.owner = t.owner),
(this.parent = this.owner.parentFragment),
(this.root = t.root),
(this.pElement = t.pElement),
@@ -4585,7 +4589,7 @@
})),
(this.value = this.argsList = null),
(this.dirtyArgs = this.dirtyValue = !0),
- (this.bound = !0);
+ (this.bound = !0));
}
function _o(t) {
if ('string' == typeof t.template) return new Nd(t);
@@ -4616,10 +4620,10 @@
}
}
function Ao(t, e) {
- (!this.owner || this.owner.hasContext) && k(this, 'context', t, e),
+ ((!this.owner || this.owner.hasContext) && k(this, 'context', t, e),
this.items.forEach(function (n) {
n.rebind && n.rebind(t, e);
- });
+ }));
}
function So() {
var t;
@@ -4652,10 +4656,10 @@
function Ro(t) {
if (!this.rendered)
throw new Error('Attempted to unrender a fragment that was not rendered');
- this.items.forEach(function (e) {
+ (this.items.forEach(function (e) {
return e.unrender(t);
}),
- (this.rendered = !1);
+ (this.rendered = !1));
}
function jo(t) {
var e, n, i, r, s;
@@ -4678,7 +4682,7 @@
}
if (s) {
var o = void 0;
- this.viewmodel.mark(Za),
+ (this.viewmodel.mark(Za),
(o = this.component) && (o.shouldDestroy = !0),
this.unrender(),
o && (o.shouldDestroy = !1),
@@ -4689,13 +4693,13 @@
root: this,
owner: this,
}))),
- (e = this.render(this.el, this.anchor));
- } else (e = mu.start(this, !0)), this.viewmodel.mark(Za), mu.end();
- return xb.fire(this, t), e;
+ (e = this.render(this.el, this.anchor)));
+ } else ((e = mu.start(this, !0)), this.viewmodel.mark(Za), mu.end());
+ return (xb.fire(this, t), e);
}
function No(t) {
var e, n;
- hd.init(null, this, { template: t }),
+ (hd.init(null, this, { template: t }),
(e = this.transitionsEnabled),
(this.transitionsEnabled = !1),
(n = this.component) && (n.shouldDestroy = !0),
@@ -4708,7 +4712,7 @@
owner: this,
})),
this.render(this.el, this.anchor),
- (this.transitionsEnabled = e);
+ (this.transitionsEnabled = e));
}
function Do(t, e) {
var n, i;
@@ -4716,15 +4720,15 @@
n = t;
for (t in n) n.hasOwnProperty(t) && ((e = n[t]), Io(this, t, e));
} else Io(this, t, e);
- return mu.end(), i;
+ return (mu.end(), i);
}
function Io(t, e, n) {
- (e = _(C(e))),
+ ((e = _(C(e))),
e.isPattern
? A(t, e).forEach(function (e) {
t.viewmodel.set(e, n);
})
- : t.viewmodel.set(e, n);
+ : t.viewmodel.set(e, n));
}
function Lo(t, e) {
return Ha(this, t, void 0 === e ? -1 : -e);
@@ -4807,7 +4811,7 @@
(!t || _(i).equalsOrStartsWith(t)) &&
r.push.apply(r, this._twowayBindings[i]);
} else r = this._twowayBindings[t];
- return (n = $o(this, r)), this.set(n);
+ return ((n = $o(this, r)), this.set(n));
}
function $o(t, e) {
var n = {},
@@ -4822,18 +4826,18 @@
t.changed() ||
(i.push(t.keypath), (i[t.keypath.str] = t))
);
- (e = t.attribute.value),
+ ((e = t.attribute.value),
(r = t.getValue()),
- j(e, r) || a(e, r) || (n[t.keypath.str] = r);
+ j(e, r) || a(e, r) || (n[t.keypath.str] = r));
}
}),
i.length &&
i.forEach(function (t) {
var e, r, s;
- (e = i[t.str]),
+ ((e = i[t.str]),
(r = e.attribute.value),
(s = e.getValue()),
- j(r, s) || (n[t.str] = s);
+ j(r, s) || (n[t.str] = s));
}),
n
);
@@ -4843,7 +4847,7 @@
}
function Zo(t) {
for (var e = {}; t; )
- Ho(t, e), Go(t, e), (t = t._Parent !== Qb ? t._Parent : !1);
+ (Ho(t, e), Go(t, e), (t = t._Parent !== Qb ? t._Parent : !1));
return e;
}
function Ho(t, e) {
@@ -4876,10 +4880,10 @@
) {
var r = void 0,
s = i._method;
- s && (i = i._method),
+ (s && (i = i._method),
(r = Wb(e[n]._method, i)),
s && (r._method = r),
- (e[n] = r);
+ (e[n] = r));
}
} else e[n] = i._method ? i._method : i;
}
@@ -4962,18 +4966,18 @@
: 0.5 * (Math.pow(t - 2, 3) + 2);
},
};
- (Xo = 'object' == typeof document),
+ ((Xo = 'object' == typeof document),
(ta = 'undefined' != typeof navigator && /jsDom/.test(navigator.appName)),
(ea =
'undefined' != typeof console &&
'function' == typeof console.warn &&
- 'function' == typeof console.warn.apply);
+ 'function' == typeof console.warn.apply));
try {
- Object.defineProperty({}, 'test', { value: 0 }), (na = !0);
+ (Object.defineProperty({}, 'test', { value: 0 }), (na = !0));
} catch (ca) {
na = !1;
}
- (ia = {
+ ((ia = {
html: 'http://www.w3.org/1999/xhtml',
mathml: 'http://www.w3.org/1998/Math/MathML',
svg: 'http://www.w3.org/2000/svg',
@@ -4989,7 +4993,7 @@
'http://www.w3.org/TR/SVG11/feature#BasicStructure',
'1.1'
)),
- (sa = ['o', 'ms', 'moz', 'webkit']);
+ (sa = ['o', 'ms', 'moz', 'webkit']));
var la, fa, da, pa, ma, va, ga, ya, ba;
if (
((la = ra
@@ -5051,12 +5055,12 @@
ka,
Ea = null;
try {
- Object.defineProperty({}, 'test', { value: 0 }),
+ (Object.defineProperty({}, 'test', { value: 0 }),
Xo &&
Object.defineProperty(document.createElement('div'), 'test', {
value: 0,
}),
- (xa = Object.defineProperty);
+ (xa = Object.defineProperty));
} catch (_a) {
xa = function (t, e, n) {
t[e] = n.value;
@@ -5068,8 +5072,8 @@
} catch (_a) {
throw _a;
}
- Xo && Object.defineProperties(la('div'), { test: { value: 0 } }),
- (ka = Object.defineProperties);
+ (Xo && Object.defineProperties(la('div'), { test: { value: 0 } }),
+ (ka = Object.defineProperties));
} catch (_a) {
ka = function (t, e) {
var n;
@@ -5077,7 +5081,7 @@
};
}
try {
- Object.create(null), (wa = Object.create);
+ (Object.create(null), (wa = Object.create));
} catch (_a) {
wa = (function () {
var t = function () {};
@@ -5111,12 +5115,12 @@
],
e =
"You're running Ractive 0.7.3 in debug mode - messages will be printed to the console to help you fix problems and optimise your application.\n\nTo disable debug mode, add this line at the start of your app:\n Ractive.DEBUG = false;\n\nTo disable debug mode when your app is minified, add this snippet:\n Ractive.DEBUG = /unminified/.test(function(){/*unminified*/});\n\nGet help and support:\n http://docs.ractivejs.org\n http://stackoverflow.com/questions/tagged/ractivejs\n http://groups.google.com/forum/#!forum/ractive-js\n http://twitter.com/ractivejs\n\nFound a bug? Raise an issue:\n https://github.com/ractivejs/ractive/issues\n\n";
- (Ca = function () {
+ ((Ca = function () {
var n = !!console.groupCollapsed;
- console[n ? 'groupCollapsed' : 'log'].apply(console, t),
+ (console[n ? 'groupCollapsed' : 'log'].apply(console, t),
console.log(e),
n && console.groupEnd(t),
- (Ca = Fa);
+ (Ca = Fa));
}),
(Sa = function (t, e) {
if ((Ca(), 'object' == typeof e[e.length - 1])) {
@@ -5145,7 +5149,7 @@
}),
(Aa = function () {
console.log.apply(console, arguments);
- });
+ }));
})()
: (Sa = Aa = Ca = Fa);
var ja = 'Bad arguments',
@@ -5202,7 +5206,7 @@
object: function (t, e) {
var n, i, r, s, o;
if (!h(t) || !h(e)) return null;
- (n = []), (s = {}), (r = {});
+ ((n = []), (s = {}), (r = {}));
for (o in t)
Oa.call(t, o) &&
(Oa.call(e, o)
@@ -5212,7 +5216,7 @@
return (
(i = n.length),
function (t) {
- for (var e, o = i; o--; ) (e = n[o]), (s[e] = r[e](t));
+ for (var e, o = i; o--; ) ((e = n[o]), (s[e] = r[e](t)));
return s;
}
);
@@ -5226,13 +5230,13 @@
qa = {},
$a = function (t) {
var e = t.split('.');
- (this.str = t),
+ ((this.str = t),
'@' === t[0] && ((this.isSpecial = !0), (this.value = E(t))),
(this.firstKey = e[0]),
(this.lastKey = e.pop()),
(this.isPattern = Ba.test(t)),
(this.parent = '' === t ? null : _(e.join('.'))),
- (this.isRoot = !t);
+ (this.isRoot = !t));
};
$a.prototype = {
equalsOrStartsWith: function (t) {
@@ -5318,7 +5322,7 @@
function n(n) {
return t[n] ? (e ? t[n](e) : t[n](), !0) : void 0;
}
- n(this.method),
+ (n(this.method),
!t[this.method] &&
this.deprecate &&
n(this.deprecate.deprecated) &&
@@ -5329,7 +5333,7 @@
this.deprecate.deprecated,
this.deprecate.replacement
)),
- e ? t.fire(this.event, e) : t.fire(this.event);
+ e ? t.fire(this.event, e) : t.fire(this.event));
};
var eu,
nu = T,
@@ -5348,13 +5352,13 @@
a = [],
u = [],
h = iu;
- (i = function (t) {
+ ((i = function (t) {
return function (i) {
h === iu && ((e = i), (h = t), (n = M(h === ru ? a : u, e)), V(n));
};
}),
(r = i(ru)),
- (s = i(su));
+ (s = i(su)));
try {
t(r, s);
} catch (c) {
@@ -5370,7 +5374,7 @@
? function (e) {
var n;
try {
- (n = t(e)), U(i, n, r, s);
+ ((n = t(e)), U(i, n, r, s));
} catch (o) {
s(o);
}
@@ -5378,7 +5382,7 @@
: n
);
};
- o(t, a, r), o(e, u, s), h !== iu && V(n);
+ (o(t, a, r), o(e, u, s), h !== iu && V(n));
});
return i;
},
@@ -5400,7 +5404,7 @@
s = function (t, r) {
t && 'function' == typeof t.then
? t.then(function (t) {
- (o[r] = t), --i || e(o);
+ ((o[r] = t), --i || e(o));
}, n)
: ((o[r] = t), --i || e(o));
},
@@ -5429,7 +5433,7 @@
},
uu = W,
hu = function (t, e) {
- (this.callback = t),
+ ((this.callback = t),
(this.parent = e),
(this.intros = []),
(this.outros = []),
@@ -5438,19 +5442,19 @@
(this.detachQueue = []),
(this.decoratorQueue = []),
(this.outrosComplete = !1),
- e && e.addChild(this);
+ e && e.addChild(this));
};
hu.prototype = {
addChild: function (t) {
- this.children.push(t),
+ (this.children.push(t),
(this.totalChildren += 1),
- (this.outroChildren += 1);
+ (this.outroChildren += 1));
},
decrementOutros: function () {
- (this.outroChildren -= 1), J(this);
+ ((this.outroChildren -= 1), J(this));
},
decrementTotal: function () {
- (this.totalChildren -= 1), J(this);
+ ((this.totalChildren -= 1), J(this));
},
add: function (t) {
var e = t.isIntro ? this.intros : this.outros;
@@ -5461,15 +5465,15 @@
},
remove: function (t) {
var e = t.isIntro ? this.intros : this.outros;
- I(e, t), J(this);
+ (I(e, t), J(this));
},
init: function () {
- (this.ready = !0), J(this);
+ ((this.ready = !0), J(this));
},
detachNodes: function () {
- this.decoratorQueue.forEach(Q),
+ (this.decoratorQueue.forEach(Q),
this.detachQueue.forEach(G),
- this.children.forEach(Y);
+ this.children.forEach(Y));
},
};
var cu,
@@ -5498,18 +5502,18 @@
);
},
end: function () {
- X(),
+ (X(),
cu.transitionManager.init(),
!cu.previousBatch &&
cu.instance &&
(cu.instance.viewmodel.changes = []),
- (cu = cu.previousBatch);
+ (cu = cu.previousBatch));
},
addRactive: function (t) {
cu && F(cu.ractives, t);
},
registerTransition: function (t) {
- (t._manager = cu.transitionManager), cu.transitionManager.add(t);
+ ((t._manager = cu.transitionManager), cu.transitionManager.add(t));
},
registerDecorator: function (t) {
cu.transitionManager.addDecorator(t);
@@ -5540,15 +5544,15 @@
tick: function () {
var t, e, n;
for (n = Xa(), mu.start(), t = 0; t < vu.length; t += 1)
- (e = vu[t]), e.tick(n) || vu.splice(t--, 1);
- mu.end(), vu.length ? Ja(gu.tick) : (gu.running = !1);
+ ((e = vu[t]), e.tick(n) || vu.splice(t--, 1));
+ (mu.end(), vu.length ? Ja(gu.tick) : (gu.running = !1));
},
add: function (t) {
- vu.push(t), gu.running || ((gu.running = !0), Ja(gu.tick));
+ (vu.push(t), gu.running || ((gu.running = !0), Ja(gu.tick)));
},
abort: function (t, e) {
for (var n, i = vu.length; i--; )
- (n = vu[i]), n.root === e && n.keypath === t && n.stop();
+ ((n = vu[i]), n.root === e && n.keypath === t && n.stop());
},
},
yu = gu,
@@ -5556,14 +5560,14 @@
var e;
this.startTime = Date.now();
for (e in t) t.hasOwnProperty(e) && (this[e] = t[e]);
- (this.interpolator = La(
+ ((this.interpolator = La(
this.from,
this.to,
this.root,
this.interpolator
)),
(this.running = !0),
- this.tick();
+ this.tick());
};
bu.prototype = {
tick: function () {
@@ -5600,10 +5604,10 @@
},
stop: function () {
var t;
- (this.running = !1),
+ ((this.running = !1),
(t = this.root._animations.indexOf(this)),
-1 === t && m('Animation was not found'),
- this.root._animations.splice(t, 1);
+ this.root._animations.splice(t, 1));
},
};
var wu = bu,
@@ -5615,13 +5619,13 @@
Su = ot,
Cu = function () {
var t, e, n;
- (t =
+ ((t =
this._root[
this._isComponentQuery ? 'liveComponentQueries' : 'liveQueries'
]),
(e = this.selector),
(n = t.indexOf(e)),
- -1 !== n && (t.splice(n, 1), (t[e] = null));
+ -1 !== n && (t.splice(n, 1), (t[e] = null)));
},
Ou = function (t, e) {
var n, i, r, s, o, a, u, h, c, l;
@@ -5633,7 +5637,7 @@
r && r === s;
)
- n.pop(), i.pop(), (o = r), (r = D(n)), (s = D(i));
+ (n.pop(), i.pop(), (o = r), (r = D(n)), (s = D(i)));
if (
((r = r.component || r),
(s = s.component || s),
@@ -5648,7 +5652,9 @@
);
if ((h = o.fragments))
return (
- (a = h.indexOf(c)), (u = h.indexOf(l)), a - u || n.length - i.length
+ (a = h.indexOf(c)),
+ (u = h.indexOf(l)),
+ a - u || n.length - i.length
);
throw new Error(
'An unexpected condition was met while comparing the position of two components. Please file an issue at https://github.com/RactiveJS/Ractive/issues - thanks!'
@@ -5661,7 +5667,7 @@
: Ou(t, e);
},
Tu = function () {
- this.sort(this._isComponentQuery ? Ou : Pu), (this._dirty = !1);
+ (this.sort(this._isComponentQuery ? Ou : Pu), (this._dirty = !1));
},
Fu = function () {
var t = this;
@@ -5683,9 +5689,9 @@
Vu = pt,
Mu = {
enqueue: function (t, e) {
- t.event &&
+ (t.event &&
((t._eventQueue = t._eventQueue || []), t._eventQueue.push(t.event)),
- (t.event = e);
+ (t.event = e));
},
dequeue: function (t) {
t._eventQueue && t._eventQueue.length
@@ -5702,16 +5708,16 @@
Qu = new nu('insert'),
Zu = kt,
Hu = function (t, e, n, i) {
- (this.root = t),
+ ((this.root = t),
(this.keypath = e),
(this.callback = n),
(this.defer = i.defer),
- (this.context = i && i.context ? i.context : t);
+ (this.context = i && i.context ? i.context : t));
};
Hu.prototype = {
init: function (t) {
- (this.value = this.root.get(this.keypath.str)),
- t !== !1 ? this.update() : (this.oldValue = this.value);
+ ((this.value = this.root.get(this.keypath.str)),
+ t !== !1 ? this.update() : (this.oldValue = this.value));
},
setValue: function (t) {
var e = this;
@@ -5740,8 +5746,8 @@
Gu = Hu,
Yu = Et,
Ju = Array.prototype.slice;
- (Ku = function (t, e, n, i) {
- (this.root = t),
+ ((Ku = function (t, e, n, i) {
+ ((this.root = t),
(this.callback = n),
(this.defer = i.defer),
(this.keypath = e),
@@ -5750,7 +5756,7 @@
)),
(this.values = {}),
this.defer && (this.proxies = []),
- (this.context = i && i.context ? i.context : t);
+ (this.context = i && i.context ? i.context : t));
}),
(Ku.prototype = {
init: function (t) {
@@ -5800,7 +5806,7 @@
this.proxies[t.str]
);
},
- });
+ }));
var Xu,
th,
eh,
@@ -5877,12 +5883,12 @@
return '\n/* {' + t.id + '} */\n' + t.styles;
})
.join('\n');
- ih ? (ih.cssText = t) : (eh.innerHTML = t),
- rh || (nh.appendChild(eh), (rh = !0));
+ (ih ? (ih.cssText = t) : (eh.innerHTML = t),
+ rh || (nh.appendChild(eh), (rh = !0)));
}),
(Xu = {
add: function (t) {
- xh.push(t), (kh = !0);
+ (xh.push(t), (kh = !0));
},
apply: function () {
kh && (th(), (kh = !1));
@@ -5916,7 +5922,7 @@
if (n.css) {
var i = Lh++,
r = n.noCssTransform ? n.css : Fh(n.css, i);
- (e.cssId = i), Ah.add({ id: i, styles: r });
+ ((e.cssId = i), Ah.add({ id: i, styles: r }));
}
},
init: function () {},
@@ -5929,28 +5935,28 @@
r = void 0;
if (n.data && h(n.data))
for (i in n.data)
- (r = n.data[i]),
+ ((r = n.data[i]),
r &&
'object' == typeof r &&
(h(r) || s(r)) &&
m(
'Passing a `data` option with object and array properties to Ractive.extend() is discouraged, as mutating them is likely to cause bugs. Consider using a data function instead:\n\n // this...\n data: function () {\n return {\n myObject: {}\n };\n })\n\n // instead of this:\n data: {\n myObject: {}\n }'
- );
+ ));
e.data = Mt(e.data, n.data);
},
init: function (t, e, n) {
var i = Mt(t.prototype.data, n.data);
- return 'function' == typeof i && (i = i.call(e)), i || {};
+ return ('function' == typeof i && (i = i.call(e)), i || {});
},
reset: function (t) {
var e = this.init(t.constructor, t, t.viewmodel);
- return t.viewmodel.reset(e), !0;
+ return (t.viewmodel.reset(e), !0);
},
},
Wh = Uh,
zh = /^\s+/;
- (_h = function (t) {
- (this.name = 'ParseError'), (this.message = t);
+ ((_h = function (t) {
+ ((this.name = 'ParseError'), (this.message = t));
try {
throw new Error(t);
} catch (e) {
@@ -5969,7 +5975,7 @@
this.lines = this.str.split('\n'),
this.lineEnds = this.lines.map(function (t) {
var e = r + t.length + 1;
- return (r = e), e;
+ return ((r = e), e);
}, 0),
this.init && this.init(t, e),
n = [];
@@ -5977,8 +5983,8 @@
)
n.push(i);
- (this.leftover = this.remaining()),
- (this.result = this.postProcess ? this.postProcess(n, e) : n);
+ ((this.leftover = this.remaining()),
+ (this.result = this.postProcess ? this.postProcess(n, e) : n));
}),
(Eh.prototype = {
read: function (t) {
@@ -5993,8 +5999,8 @@
},
getLinePos: function (t) {
for (var e, n = 0, i = 0; t >= this.lineEnds[n]; )
- (i = this.lineEnds[n]), (n += 1);
- return (e = t - i), [n + 1, e + 1, t];
+ ((i = this.lineEnds[n]), (n += 1));
+ return ((e = t - i), [n + 1, e + 1, t]);
},
error: function (t) {
var e = this.getLinePos(this.pos),
@@ -6004,7 +6010,7 @@
s = 0,
o =
r.replace(/\t/g, function (t, n) {
- return n < e[1] && (s += 1), ' ';
+ return (n < e[1] && (s += 1), ' ');
}) +
'\n' +
new Array(e[1] + s).join(' ') +
@@ -6037,13 +6043,13 @@
var e,
n,
i = this;
- (e = function (t, e) {
+ ((e = function (t, e) {
Eh.call(this, t, e);
}),
- (e.prototype = wa(i.prototype));
+ (e.prototype = wa(i.prototype)));
for (n in t) Oa.call(t, n) && (e.prototype[n] = t[n]);
- return (e.extend = Eh.extend), e;
- });
+ return ((e.extend = Eh.extend), e);
+ }));
var Bh,
qh,
$h,
@@ -6101,25 +6107,25 @@
zc =
/^(?:[+-]?)0*(?:(?:(?:[1-9]\d*)?\.\d+)|(?:(?:0|[1-9]\d*)\.)|(?:0|[1-9]\d*))(?:[eE][+-]?\d+)?/,
Bc = Zt;
- (Bh = /^(?=.)[^"'\\]+?(?:(?!.)|(?=["'\\]))/),
+ ((Bh = /^(?=.)[^"'\\]+?(?:(?!.)|(?=["'\\]))/),
(qh =
/^\\(?:['"\\bfnrt]|0(?![0-9])|x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|(?=.)[^ux0-9])/),
- ($h = /^\\(?:\r\n|[\u000A\u000D\u2028\u2029])/);
+ ($h = /^\\(?:\r\n|[\u000A\u000D\u2028\u2029])/));
var qc,
$c,
Qc = function (t) {
return function (e) {
var n, i, r, s;
for (n = e.pos, i = '"', r = !1; !r; )
- (s = e.matchPattern(Bh) || e.matchPattern(qh) || e.matchString(t)),
+ ((s = e.matchPattern(Bh) || e.matchPattern(qh) || e.matchString(t)),
s
? (i += '"' === s ? '\\"' : "\\'" === s ? "'" : s)
: ((s = e.matchPattern($h)),
s
? (i +=
'\\u' + ('000' + s.charCodeAt(1).toString(16)).slice(-4))
- : (r = !0));
- return (i += '"'), JSON.parse(i);
+ : (r = !0)));
+ return ((i += '"'), JSON.parse(i));
};
},
Zc = Qc('"'),
@@ -6169,10 +6175,10 @@
rl = Jt,
sl = Xt,
ol = /^(?:~\/|(?:\.\.\/)+|\.\/(?:\.\.\/)*|\.)/;
- (qc =
+ ((qc =
/^(?:Array|console|Date|RegExp|decodeURIComponent|decodeURI|encodeURIComponent|encodeURI|isFinite|isNaN|parseFloat|parseInt|JSON|Math|NaN|undefined|null)\b/),
($c =
- /^(?:break|case|catch|continue|debugger|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|var|void|while|with)$/);
+ /^(?:break|case|catch|continue|debugger|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|var|void|while|with)$/));
var al,
ul,
hl = /^[a-zA-Z$_0-9]+(?:(?:\.[a-zA-Z$_0-9]+)|(?:\[[0-9]+\]))*/,
@@ -6189,16 +6195,16 @@
if (((e = t.pos), (i = dl(t)))) n = { t: bc, x: n, r: i };
else {
if (!t.matchString('(')) break;
- t.allowWhitespace(),
+ (t.allowWhitespace(),
(r = nl(t)),
t.allowWhitespace(),
t.matchString(')') || t.error(Uc),
(n = { t: _c, x: n }),
- r && (n.o = r);
+ r && (n.o = r));
}
return n;
};
- (ul = function (t, e) {
+ ((ul = function (t, e) {
return function (n) {
var i;
return (i = e(n))
@@ -6218,22 +6224,22 @@
e > t;
t += 1
)
- (n = ul(i[t], r)), (r = n);
+ ((n = ul(i[t], r)), (r = n));
al = r;
- })();
+ })());
var ml,
vl,
gl = al;
- (vl = function (t, e) {
+ ((vl = function (t, e) {
return function (n) {
var i, r, s;
if (((r = e(n)), !r)) return null;
for (;;) {
if (((i = n.pos), n.allowWhitespace(), !n.matchString(t)))
- return (n.pos = i), r;
+ return ((n.pos = i), r);
if ('in' === t && /[a-zA-Z_$0-9]/.test(n.remaining().charAt(0)))
- return (n.pos = i), r;
- if ((n.allowWhitespace(), (s = e(n)), !s)) return (n.pos = i), r;
+ return ((n.pos = i), r);
+ if ((n.allowWhitespace(), (s = e(n)), !s)) return ((n.pos = i), r);
r = { t: Ec, s: t, o: [r, s] };
}
};
@@ -6251,9 +6257,9 @@
e > t;
t += 1
)
- (n = vl(i[t], r)), (r = n);
+ ((n = vl(i[t], r)), (r = n));
ml = r;
- })();
+ })());
var yl,
bl,
wl,
@@ -6289,7 +6295,7 @@
Gl = Ee,
Yl = '';
- (yl =
+ ((yl =
/^(allowFullscreen|async|autofocus|autoplay|checked|compact|controls|declare|default|defaultChecked|defaultMuted|defaultSelected|defer|disabled|enabled|formNoValidate|hidden|indeterminate|inert|isMap|itemScope|loop|multiple|muted|noHref|noResize|noShade|noValidate|noWrap|open|pauseOnExit|readOnly|required|reversed|scoped|seamless|selected|sortable|translate|trueSpeed|typeMustMatch|visible)$/i),
(bl =
/^(?:area|base|br|col|command|doctype|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)$/i),
@@ -6559,7 +6565,7 @@
)),
(El = //g),
- (Al = /&/g);
+ (Al = /&/g));
var Xl,
tf,
ef,
@@ -6572,7 +6578,7 @@
hf = function (t) {
var e, n, i, r, s;
for (e = 1; e < t.length; e += 1)
- (n = t[e]),
+ ((n = t[e]),
(i = t[e - 1]),
(r = t[e - 2]),
Ce(n) &&
@@ -6595,19 +6601,19 @@
uf.test(s) &&
af.test(n) &&
((i.f[i.f.length - 1] = s.replace(uf, '\n')),
- (t[e] = n.replace(af, ''))));
+ (t[e] = n.replace(af, '')))));
return t;
},
cf = function (t, e, n) {
var i;
- e &&
+ (e &&
((i = t[0]),
'string' == typeof i &&
((i = i.replace(e, '')), i ? (t[0] = i) : t.shift())),
n &&
((i = D(t)),
'string' == typeof i &&
- ((i = i.replace(n, '')), i ? (t[t.length - 1] = i) : t.pop()));
+ ((i = i.replace(n, '')), i ? (t[t.length - 1] = i) : t.pop())));
},
lf = Te,
ff = /[ \t\f\r\n]+/g,
@@ -6629,7 +6635,7 @@
xf = Re,
kf = /^[^\s"'>\/=]+/,
Ef = /^[^\s"'=<>`]+/;
- (tf = { true: !0, false: !1, undefined: void 0, null: null }),
+ ((tf = { true: !0, false: !1, undefined: void 0, null: null }),
(ef = new RegExp('^(?:' + Object.keys(tf).join('|') + ')')),
(nf =
/^(?:[+-]?)(?:(?:(?:0|[1-9]\d*)?\.\d+)|(?:(?:0|[1-9]\d*)\.)|(?:0|[1-9]\d*))(?:[eE][+-]?\d+)?/),
@@ -6638,7 +6644,7 @@
(of = /^\s*$/),
(Xl = Qh.extend({
init: function (t, e) {
- (this.values = e.values), this.allowWhitespace();
+ ((this.values = e.values), this.allowWhitespace());
},
postProcess: function (t) {
return 1 === t.length && of.test(this.leftover)
@@ -6698,7 +6704,7 @@
return null;
},
],
- }));
+ })));
var _f,
Af = function (t, e) {
var n = new Xl(t, { values: e });
@@ -6759,7 +6765,7 @@
var n = e.tripleDelimiters || ['{{{', '}}}'],
i = e.staticDelimiters || ['[[', ']]'],
r = e.staticTripleDelimiters || ['[[[', ']]]'];
- (this.standardDelimiters = e.delimiters || ['{{', '}}']),
+ ((this.standardDelimiters = e.delimiters || ['{{', '}}']),
(this.tags = [
{
isStatic: !1,
@@ -6792,7 +6798,7 @@
(this.sanitizeElements = e.sanitize && e.sanitize.elements),
(this.sanitizeEventAttributes =
e.sanitize && e.sanitize.eventAttributes),
- (this.includeLinePositions = e.includeLinePositions);
+ (this.includeLinePositions = e.includeLinePositions));
},
postProcess: function (t) {
return t.length
@@ -6844,14 +6850,14 @@
},
init: function (t, e, n) {
var i, r;
- (i = 'template' in n ? n.template : t.prototype.template),
+ ((i = 'template' in n ? n.template : t.prototype.template),
'function' == typeof i &&
((r = i),
(i = en(e, r)),
(e._config.template = { fn: r, result: i })),
(i = rn(i, e)),
(e.template = i.t),
- i.p && sn(e.partials, i.p);
+ i.p && sn(e.partials, i.p));
},
reset: function (t) {
var e,
@@ -6862,7 +6868,7 @@
},
},
hd = ud;
- (nd = [
+ ((nd = [
'adaptors',
'components',
'computed',
@@ -6874,7 +6880,7 @@
'transitions',
]),
(id = function (t, e) {
- (this.name = t), (this.useDefaults = e);
+ ((this.name = t), (this.useDefaults = e));
}),
(id.prototype = {
constructor: id,
@@ -6908,7 +6914,7 @@
}),
(rd = nd.map(function (t) {
return new id(t, 'computed' === t);
- }));
+ })));
var cd,
ld,
fd,
@@ -6918,7 +6924,7 @@
vd = rd,
gd = on,
yd = cn;
- (dd = { adapt: Th, css: Mh, data: Wh, template: hd }),
+ ((dd = { adapt: Th, css: Mh, data: Wh, template: hd }),
(fd = Object.keys(ua)),
(md = dn(
fd.filter(function (t) {
@@ -6958,7 +6964,7 @@
});
},
order: ld,
- });
+ }));
var bd = cd,
wd = pn,
xd = mn,
@@ -6976,7 +6982,7 @@
return e(this.node);
},
jd = function (t) {
- (this.type = Zh), (this.text = t.template);
+ ((this.type = Zh), (this.text = t.template));
};
jd.prototype = {
detach: Rd,
@@ -6985,7 +6991,8 @@
},
render: function () {
return (
- this.node || (this.node = document.createTextNode(this.text)), this.node
+ this.node || (this.node = document.createTextNode(this.text)),
+ this.node
);
},
toString: function (t) {
@@ -7000,20 +7007,20 @@
Id = Cn,
Ld = function (t, e, n) {
var i;
- (this.ref = e),
+ ((this.ref = e),
(this.resolved = !1),
(this.root = t.root),
(this.parentFragment = t.parentFragment),
(this.callback = n),
(i = uu(t.root, e, t.parentFragment)),
- void 0 != i ? this.resolve(i) : mu.addUnresolved(this);
+ void 0 != i ? this.resolve(i) : mu.addUnresolved(this));
};
Ld.prototype = {
resolve: function (t) {
- this.keypath && !t && mu.addUnresolved(this),
+ (this.keypath && !t && mu.addUnresolved(this),
(this.resolved = !0),
(this.keypath = t),
- this.callback(t);
+ this.callback(t));
},
forceResolution: function () {
this.resolve(_(this.ref));
@@ -7029,10 +7036,10 @@
};
var Vd = Ld,
Md = function (t, e, n) {
- (this.parentFragment = t.parentFragment),
+ ((this.parentFragment = t.parentFragment),
(this.ref = e),
(this.callback = n),
- this.rebind();
+ this.rebind());
},
Ud = {
'@keypath': { prefix: 'c', prop: ['context'] },
@@ -7083,18 +7090,18 @@
};
var Wd = Md,
zd = function (t, e, n) {
- (this.parentFragment = t.parentFragment),
+ ((this.parentFragment = t.parentFragment),
(this.ref = e),
(this.callback = n),
e.ref.fragment.registerIndexRef(this),
- this.rebind();
+ this.rebind());
};
zd.prototype = {
rebind: function () {
var t,
e = this.ref.ref;
- (t = 'k' === e.ref.t ? 'k' + e.fragment.key : 'i' + e.fragment.index),
- void 0 !== t && this.callback(_('@' + t));
+ ((t = 'k' === e.ref.t ? 'k' + e.fragment.key : 'i' + e.fragment.index),
+ void 0 !== t && this.callback(_('@' + t)));
},
unbind: function () {
this.ref.ref.fragment.unregisterIndexRef(this);
@@ -7107,8 +7114,8 @@
n,
i = {};
for (e in t.refs)
- (n = t.refs[e]),
- (i[n.ref.n] = 'k' === n.ref.t ? n.fragment.key : n.fragment.index);
+ ((n = t.refs[e]),
+ (i[n.ref.n] = 'k' === n.ref.t ? n.fragment.key : n.fragment.index));
return i;
};
var $d,
@@ -7116,10 +7123,10 @@
Zd = Fn,
Hd = {},
Kd = Function.prototype.bind;
- ($d = function (t, e, n, i) {
+ (($d = function (t, e, n, i) {
var r,
s = this;
- (r = t.root),
+ ((r = t.root),
(this.root = r),
(this.parentFragment = e),
(this.callback = i),
@@ -7133,7 +7140,7 @@
});
})),
(this.ready = !0),
- this.bubble();
+ this.bubble());
}),
($d.prototype = {
bubble: function () {
@@ -7147,7 +7154,7 @@
for (var t; (t = this.refResolvers.pop()); ) t.unbind();
},
resolve: function (t, e) {
- (this.keypaths[t] = e), this.bubble();
+ ((this.keypaths[t] = e), this.bubble());
},
createEvaluator: function () {
var t,
@@ -7156,7 +7163,7 @@
i,
r,
s = this;
- (i = this.keypath),
+ ((i = this.keypath),
(t = this.root.viewmodel.computations[i.str]),
t
? this.root.viewmodel.mark(i)
@@ -7177,7 +7184,10 @@
noUnwrap: !0,
fullRootGet: !0,
});
- return 'function' == typeof e && (e = In(e, s.root)), e;
+ return (
+ 'function' == typeof e && (e = In(e, s.root)),
+ e
+ );
};
})),
(n = {
@@ -7187,18 +7197,18 @@
return r.apply(null, t);
},
}),
- (t = this.root.viewmodel.compute(i, n)));
+ (t = this.root.viewmodel.compute(i, n))));
},
rebind: function (t, e) {
this.refResolvers.forEach(function (n) {
return n.rebind(t, e);
});
},
- });
+ }));
var Gd = $d,
Yd = function (t, e, n) {
var i = this;
- (this.resolver = e),
+ ((this.resolver = e),
(this.root = e.root),
(this.parentFragment = n),
(this.viewmodel = e.root.viewmodel),
@@ -7210,15 +7220,15 @@
}))
: new Gd(e, n, t, function (t) {
i.resolve(t);
- });
+ }));
};
Yd.prototype = {
resolve: function (t) {
- this.keypath && this.viewmodel.unregister(this.keypath, this),
+ (this.keypath && this.viewmodel.unregister(this.keypath, this),
(this.keypath = t),
(this.value = this.viewmodel.get(t)),
this.bind(),
- this.resolver.bubble();
+ this.resolver.bubble());
},
bind: function () {
this.viewmodel.register(this.keypath, this);
@@ -7227,11 +7237,11 @@
this.refResolver && this.refResolver.rebind(t, e);
},
setValue: function (t) {
- (this.value = t), this.resolver.bubble();
+ ((this.value = t), this.resolver.bubble());
},
unbind: function () {
- this.keypath && this.viewmodel.unregister(this.keypath, this),
- this.refResolver && this.refResolver.unbind();
+ (this.keypath && this.viewmodel.unregister(this.keypath, this),
+ this.refResolver && this.refResolver.unbind());
},
forceResolution: function () {
this.refResolver && this.refResolver.forceResolution();
@@ -7244,7 +7254,7 @@
s,
o,
a = this;
- (this.parentFragment = o = t.parentFragment),
+ ((this.parentFragment = o = t.parentFragment),
(this.root = i = t.root),
(this.mustache = t),
(this.ref = r = e.r),
@@ -7253,13 +7263,13 @@
(s = uu(i, r, o))
? (this.base = s)
: (this.baseResolver = new Vd(this, r, function (t) {
- (a.base = t), (a.baseResolver = null), a.bubble();
+ ((a.base = t), (a.baseResolver = null), a.bubble());
})),
(this.members = e.m.map(function (t) {
return new Jd(t, a, o);
})),
(this.ready = !0),
- this.bubble();
+ this.bubble());
};
Xd.prototype = {
getKeypath: function () {
@@ -7280,18 +7290,18 @@
var i = this.base.replace(t, e);
i && i !== this.base && ((this.base = i), (n = !0));
}
- this.members.forEach(function (i) {
+ (this.members.forEach(function (i) {
i.rebind(t, e) && (n = !0);
}),
- n && this.bubble();
+ n && this.bubble());
},
forceResolution: function () {
- this.baseResolver &&
+ (this.baseResolver &&
((this.base = _(this.ref)),
this.baseResolver.unbind(),
(this.baseResolver = null)),
this.members.forEach(Mn),
- this.bubble();
+ this.bubble());
},
};
var tp = Xd,
@@ -7300,7 +7310,7 @@
ip = zn,
rp = { getValue: Id, init: ep, resolve: np, rebind: ip },
sp = function (t) {
- (this.type = Hh), rp.init(this, t);
+ ((this.type = Hh), rp.init(this, t));
};
sp.prototype = {
update: function () {
@@ -7322,13 +7332,13 @@
getValue: rp.getValue,
setValue: function (t) {
var e;
- this.keypath &&
+ (this.keypath &&
(e = this.root.viewmodel.wrapped[this.keypath.str]) &&
(t = e.get()),
a(t, this.value) ||
((this.value = t),
this.parentFragment.bubble(),
- this.node && mu.addView(this));
+ this.node && mu.addView(this)));
},
firstNode: function () {
return this.node;
@@ -7358,7 +7368,7 @@
xp = di,
kp = vi,
Ep = function (t) {
- (this.type = Gh),
+ ((this.type = Gh),
(this.subtype = this.currentSubtype = t.template.n),
(this.inverted = this.subtype === Sc),
(this.pElement = t.pElement),
@@ -7372,7 +7382,7 @@
})),
(this.renderedFragments = []),
(this.length = 0),
- rp.init(this, t);
+ rp.init(this, t));
};
Ep.prototype = {
bubble: ap,
@@ -7412,14 +7422,14 @@
try {
la('table').innerHTML = 'foo';
} catch (_a) {
- (_p = !0),
+ ((_p = !0),
(Ap = {
TABLE: ['
'],
THEAD: ['
'],
TBODY: ['
'],
TR: ['
'],
SELECT: ['
'],
- });
+ }));
}
var Rp = function (t, e, n) {
var i,
@@ -7445,7 +7455,7 @@
(o = i.firstChild);
)
- u.push(o), n.appendChild(o);
+ (u.push(o), n.appendChild(o));
if ('SELECT' === e.tagName)
for (a = u.length; a--; ) u[a] !== s && (u[a].selected = !1);
}
@@ -7458,7 +7468,7 @@
Lp = Ci,
Vp = Oi,
Mp = function (t) {
- (this.type = Kh), rp.init(this, t);
+ ((this.type = Kh), rp.init(this, t));
};
Mp.prototype = {
detach: Cp,
@@ -7494,10 +7504,10 @@
: null;
},
Hp = function (t, e) {
- e._test(this, !0) &&
+ (e._test(this, !0) &&
e.live &&
(this.liveQueries || (this.liveQueries = [])).push(e),
- this.fragment && this.fragment.findAll(t, e);
+ this.fragment && this.fragment.findAll(t, e));
},
Kp = function (t, e) {
this.fragment && this.fragment.findAllComponents(t, e);
@@ -7525,7 +7535,7 @@
);
},
im = ji;
- (Up =
+ ((Up =
'altGlyph altGlyphDef altGlyphItem animateColor animateMotion animateTransform clipPath feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence foreignObject glyphRef linearGradient radialGradient textPath vkern'.split(
' '
)),
@@ -7537,7 +7547,7 @@
for (var e = {}, n = t.length; n--; ) e[t[n].toLowerCase()] = t[n];
return e;
}),
- (Bp = zp(Up.concat(Wp)));
+ (Bp = zp(Up.concat(Wp))));
var rm = function (t) {
var e = t.toLowerCase();
return Bp[e] || e;
@@ -7623,25 +7633,27 @@
((i = new Om({ element: t, name: n, value: e[n], root: t.root })),
(r[n] = i),
'value' !== n && r.push(i));
- return (i = r.value) && r.push(i), r;
+ return ((i = r.value) && r.push(i), r);
};
'undefined' != typeof document && (Cm = la('div'));
var Tm = function (t, e) {
- (this.element = t),
+ ((this.element = t),
(this.root = t.root),
(this.parentFragment = t.parentFragment),
(this.attributes = []),
- (this.fragment = new yb({ root: t.root, owner: this, template: [e] }));
+ (this.fragment = new yb({ root: t.root, owner: this, template: [e] })));
};
Tm.prototype = {
bubble: function () {
- this.node && this.update(), this.element.bubble();
+ (this.node && this.update(), this.element.bubble());
},
rebind: function (t, e) {
this.fragment.rebind(t, e);
},
render: function (t) {
- (this.node = t), (this.isSvg = t.namespaceURI === ia.svg), this.update();
+ ((this.node = t),
+ (this.isSvg = t.namespaceURI === ia.svg),
+ this.update());
},
unbind: function () {
this.fragment.unbind();
@@ -7650,7 +7662,7 @@
var t,
e,
n = this;
- (t = this.fragment.toString()),
+ ((t = this.fragment.toString()),
(e = tr(t, this.isSvg)),
this.attributes
.filter(function (t) {
@@ -7662,7 +7674,7 @@
e.forEach(function (t) {
n.node.setAttribute(t.name, t.value);
}),
- (this.attributes = e);
+ (this.attributes = e));
},
toString: function () {
return this.fragment.toString();
@@ -7707,37 +7719,37 @@
var s = e.template.r
? "'" + e.template.r + "' reference"
: 'expression';
- m(
+ (m(
'The %s being used for two-way binding is ambiguous, and may cause unexpected results. Consider initialising your data to eliminate the ambiguity',
s,
{ ractive: this.root }
),
e.resolver.forceResolution(),
- (n = e.keypath);
+ (n = e.keypath));
}
- (this.attribute.isTwoway = !0),
+ ((this.attribute.isTwoway = !0),
(this.keypath = n),
(i = this.root.viewmodel.get(n)),
void 0 === i &&
this.getInitialValue &&
((i = this.getInitialValue()),
void 0 !== i && this.root.viewmodel.set(n, i)),
- (r = nr(t)) && ((this.resetValue = i), r.formBindings.push(this));
+ (r = nr(t)) && ((this.resetValue = i), r.formBindings.push(this)));
};
- (jm.prototype = {
+ ((jm.prototype = {
handleChange: function () {
var t = this;
- mu.start(this.root),
+ (mu.start(this.root),
(this.attribute.locked = !0),
this.root.viewmodel.set(this.keypath, this.getValue()),
mu.scheduleTask(function () {
return (t.attribute.locked = !1);
}),
- mu.end();
+ mu.end());
},
rebound: function () {
var t, e, n;
- (e = this.keypath),
+ ((e = this.keypath),
(n = this.attribute.interpolator.keypath),
e !== n &&
(I(this.root._twowayBindings[e.str], this),
@@ -7745,7 +7757,7 @@
(t =
this.root._twowayBindings[n.str] ||
(this.root._twowayBindings[n.str] = [])),
- t.push(this));
+ t.push(this)));
},
unbind: function () {},
}),
@@ -7754,14 +7766,14 @@
n = this;
return (
(e = function (t) {
- jm.call(this, t), this.init && this.init();
+ (jm.call(this, t), this.init && this.init());
}),
(e.prototype = wa(n.prototype)),
i(e.prototype, t),
(e.extend = jm.extend),
e
);
- });
+ }));
var Nm,
Dm = jm,
Im = ir;
@@ -7776,7 +7788,7 @@
var t,
e = this.element.node,
n = !1;
- (this.rendered = !0),
+ ((this.rendered = !0),
(t = this.root.lazy),
this.element.lazy === !0
? (t = !0)
@@ -7790,15 +7802,15 @@
t ||
(e.addEventListener('input', this.handler, !1),
e.attachEvent && e.addEventListener('keyup', this.handler, !1)),
- e.addEventListener('blur', rr, !1);
+ e.addEventListener('blur', rr, !1));
},
unrender: function () {
var t = this.element.node;
- (this.rendered = !1),
+ ((this.rendered = !1),
t.removeEventListener('change', Im, !1),
t.removeEventListener('input', this.handler, !1),
t.removeEventListener('keyup', this.handler, !1),
- t.removeEventListener('blur', rr, !1);
+ t.removeEventListener('blur', rr, !1));
},
});
var Lm = Nm,
@@ -7816,29 +7828,29 @@
zm = Dm.extend({
name: 'checked',
init: function () {
- (this.siblings = Um(
+ ((this.siblings = Um(
this.root._guid,
'radio',
this.element.getAttribute('name')
)),
- this.siblings.push(this);
+ this.siblings.push(this));
},
render: function () {
var t = this.element.node;
- t.addEventListener('change', Im, !1),
- t.attachEvent && t.addEventListener('click', Im, !1);
+ (t.addEventListener('change', Im, !1),
+ t.attachEvent && t.addEventListener('click', Im, !1));
},
unrender: function () {
var t = this.element.node;
- t.removeEventListener('change', Im, !1),
- t.removeEventListener('click', Im, !1);
+ (t.removeEventListener('change', Im, !1),
+ t.removeEventListener('click', Im, !1));
},
handleChange: function () {
- mu.start(this.root),
+ (mu.start(this.root),
this.siblings.forEach(function (t) {
t.root.viewmodel.set(t.keypath, t.getValue());
}),
- mu.end();
+ mu.end());
},
getValue: function () {
return this.element.node.checked;
@@ -7851,9 +7863,9 @@
qm = Dm.extend({
name: 'name',
init: function () {
- (this.siblings = Um(this.root._guid, 'radioname', this.keypath.str)),
+ ((this.siblings = Um(this.root._guid, 'radioname', this.keypath.str)),
this.siblings.push(this),
- (this.radioName = !0);
+ (this.radioName = !0));
},
getInitialValue: function () {
return this.element.getAttribute('checked')
@@ -7862,17 +7874,17 @@
},
render: function () {
var t = this.element.node;
- (t.name = '{{' + this.keypath.str + '}}'),
+ ((t.name = '{{' + this.keypath.str + '}}'),
(t.checked =
this.root.viewmodel.get(this.keypath) ==
this.element.getAttribute('value')),
t.addEventListener('change', Im, !1),
- t.attachEvent && t.addEventListener('click', Im, !1);
+ t.attachEvent && t.addEventListener('click', Im, !1));
},
unrender: function () {
var t = this.element.node;
- t.removeEventListener('change', Im, !1),
- t.removeEventListener('click', Im, !1);
+ (t.removeEventListener('change', Im, !1),
+ t.removeEventListener('click', Im, !1));
},
getValue: function () {
var t = this.element.node;
@@ -7883,8 +7895,8 @@
},
rebound: function (t, e) {
var n;
- Dm.prototype.rebound.call(this, t, e),
- (n = this.element.node) && (n.name = '{{' + this.keypath.str + '}}');
+ (Dm.prototype.rebound.call(this, t, e),
+ (n = this.element.node) && (n.name = '{{' + this.keypath.str + '}}'));
},
unbind: function () {
I(this.siblings, this);
@@ -7894,11 +7906,11 @@
Qm = Dm.extend({
name: 'name',
getInitialValue: function () {
- return (this.noInitialValue = !0), [];
+ return ((this.noInitialValue = !0), []);
},
init: function () {
var t, e;
- (this.checkboxName = !0),
+ ((this.checkboxName = !0),
(this.siblings = Um(this.root._guid, 'checkboxes', this.keypath.str)),
this.siblings.push(this),
this.noInitialValue && (this.siblings.noInitialValue = !0),
@@ -7906,7 +7918,7 @@
this.element.getAttribute('checked') &&
((t = this.root.viewmodel.get(this.keypath)),
(e = this.element.getAttribute('value')),
- t.push(e));
+ t.push(e)));
},
unbind: function () {
I(this.siblings, this);
@@ -7915,28 +7927,29 @@
var t,
e,
n = this.element.node;
- (t = this.root.viewmodel.get(this.keypath)),
+ ((t = this.root.viewmodel.get(this.keypath)),
(e = this.element.getAttribute('value')),
(this.isChecked = s(t) ? R(t, e) : t == e),
(n.name = '{{' + this.keypath.str + '}}'),
(n.checked = this.isChecked),
n.addEventListener('change', Im, !1),
- n.attachEvent && n.addEventListener('click', Im, !1);
+ n.attachEvent && n.addEventListener('click', Im, !1));
},
unrender: function () {
var t = this.element.node;
- t.removeEventListener('change', Im, !1),
- t.removeEventListener('click', Im, !1);
+ (t.removeEventListener('change', Im, !1),
+ t.removeEventListener('click', Im, !1));
},
changed: function () {
var t = !!this.isChecked;
return (
- (this.isChecked = this.element.node.checked), this.isChecked === t
+ (this.isChecked = this.element.node.checked),
+ this.isChecked === t
);
},
handleChange: function () {
- (this.isChecked = this.element.node.checked),
- Dm.prototype.handleChange.call(this);
+ ((this.isChecked = this.element.node.checked),
+ Dm.prototype.handleChange.call(this));
},
getValue: function () {
return this.siblings.filter(ar).map(ur);
@@ -7947,13 +7960,13 @@
name: 'checked',
render: function () {
var t = this.element.node;
- t.addEventListener('change', Im, !1),
- t.attachEvent && t.addEventListener('click', Im, !1);
+ (t.addEventListener('change', Im, !1),
+ t.attachEvent && t.addEventListener('click', Im, !1));
},
unrender: function () {
var t = this.element.node;
- t.removeEventListener('change', Im, !1),
- t.removeEventListener('click', Im, !1);
+ (t.removeEventListener('change', Im, !1),
+ t.removeEventListener('click', Im, !1));
},
getValue: function () {
return this.element.node.checked;
@@ -7973,7 +7986,7 @@
) {
for (; e--; )
if (r[e].getAttribute('selected')) {
- (n = r[e].getAttribute('value')), (i = !0);
+ ((n = r[e].getAttribute('value')), (i = !0));
break;
}
if (!i)
@@ -7982,7 +7995,7 @@
n = r[e].getAttribute('value');
break;
}
- return void 0 !== n && (this.element.attributes.value.value = n), n;
+ return (void 0 !== n && (this.element.attributes.value.value = n), n);
}
},
render: function () {
@@ -8024,9 +8037,9 @@
},
render: function () {
var t;
- this.element.node.addEventListener('change', Im, !1),
+ (this.element.node.addEventListener('change', Im, !1),
(t = this.root.viewmodel.get(this.keypath)),
- void 0 === t && this.handleChange();
+ void 0 === t && this.handleChange());
},
unrender: function () {
this.element.node.removeEventListener('change', Im, !1);
@@ -8041,9 +8054,9 @@
i > n;
n += 1
)
- (r = e[n]),
+ ((r = e[n]),
r.selected &&
- ((s = r._ractive ? r._ractive.value : r.value), t.push(s));
+ ((s = r._ractive ? r._ractive.value : r.value), t.push(s)));
return t;
},
handleChange: function () {
@@ -8139,7 +8152,7 @@
for (i in e)
if (e.hasOwnProperty(i))
for (r = i.split('-'), n = r.length; n--; )
- (s = new bv(t, r[n], e[i])), o.push(s);
+ ((s = new bv(t, r[n], e[i])), o.push(s));
return o;
},
xv = function (t, e) {
@@ -8147,7 +8160,7 @@
i,
r,
s = this;
- (this.element = t),
+ ((this.element = t),
(this.root = n = t.root),
(i = e.n || e),
('string' == typeof i ||
@@ -8161,12 +8174,12 @@
((this.fragment = new yb({ template: e.d, root: n, owner: t })),
(this.params = this.fragment.getArgsList()),
(this.fragment.bubble = function () {
- (this.dirtyArgs = this.dirtyValue = !0),
+ ((this.dirtyArgs = this.dirtyValue = !0),
(s.params = this.getArgsList()),
- s.ready && s.update();
+ s.ready && s.update());
})),
(this.fn = g('decorators', n, i)),
- this.fn || l(Da(i, 'decorator')));
+ this.fn || l(Da(i, 'decorator'))));
};
xv.prototype = {
init: function () {
@@ -8181,7 +8194,7 @@
throw new Error(
'Decorator definition must return an object with a teardown method'
);
- (this.actual = e), (this.ready = !0);
+ ((this.actual = e), (this.ready = !0));
},
update: function () {
this.actual.update
@@ -8192,9 +8205,9 @@
this.fragment && this.fragment.rebind(t, e);
},
teardown: function (t) {
- (this.torndown = !0),
+ ((this.torndown = !0),
this.ready && this.actual.teardown(),
- !t && this.fragment && this.fragment.unbind();
+ !t && this.fragment && this.fragment.unbind());
},
};
var kv,
@@ -8237,13 +8250,13 @@
(Tv = function (t) {
var e, n, i, r, o;
if (((e = Fv(this.node)), 'string' == typeof t))
- return (o = e[Rv(t)]), '0px' === o && (o = 0), o;
+ return ((o = e[Rv(t)]), '0px' === o && (o = 0), o);
if (!s(t))
throw new Error(
'Transition$getStyle must be passed a string, or an array of strings representing CSS properties'
);
for (n = {}, i = t.length; i--; )
- (r = t[i]), (o = e[Rv(r)]), '0px' === o && (o = 0), (n[r] = o);
+ ((r = t[i]), (o = e[Rv(r)]), '0px' === o && (o = 0), (n[r] = o));
return n;
}))
: (Tv = null);
@@ -8256,7 +8269,7 @@
},
Dv = function (t) {
var e;
- (this.duration = t.duration),
+ ((this.duration = t.duration),
(this.step = t.step),
(this.complete = t.complete),
'string' == typeof t.easing
@@ -8267,7 +8280,7 @@
(this.start = Xa()),
(this.end = this.start + this.duration),
(this.running = !0),
- yu.add(this);
+ yu.add(this));
};
Dv.prototype = {
tick: function (t) {
@@ -8282,7 +8295,7 @@
: !1;
},
stop: function () {
- this.abort && this.abort(), (this.running = !1);
+ (this.abort && this.abort(), (this.running = !1));
},
};
var Iv,
@@ -8328,7 +8341,7 @@
(Iv = function (t, e, n, i, r) {
setTimeout(function () {
var s, o, a, u, h;
- (u = function () {
+ ((u = function () {
o && a && (t.root.fire(t.name + ':end', t.node, t.isIntro), r());
}),
(s = (t.node.namespaceURI || '') + t.node.tagName),
@@ -8337,15 +8350,15 @@
(t.node.style[Wv] = n.duration / 1e3 + 's'),
(h = function (e) {
var n;
- (n = i.indexOf(Pv(Qv(e.propertyName)))),
+ ((n = i.indexOf(Pv(Qv(e.propertyName)))),
-1 !== n && i.splice(n, 1),
i.length ||
- (t.node.removeEventListener(Mv, h, !1), (a = !0), u());
+ (t.node.removeEventListener(Mv, h, !1), (a = !0), u()));
}),
t.node.addEventListener(Mv, h, !1),
setTimeout(function () {
for (var r, c, l, f, d, p = i.length, v = []; p--; )
- (f = i[p]),
+ ((f = i[p]),
(r = s + f),
Uv &&
!Gv[r] &&
@@ -8369,8 +8382,8 @@
name: Rv(f),
interpolator: La(parseFloat(c), parseFloat(e[f])),
suffix: d,
- }));
- v.length
+ })));
+ (v.length
? new qv({
root: t.root,
duration: n.duration,
@@ -8378,17 +8391,18 @@
step: function (e) {
var n, i;
for (i = v.length; i--; )
- (n = v[i]),
- (t.node.style[n.name] = n.interpolator(e) + n.suffix);
+ ((n = v[i]),
+ (t.node.style[n.name] =
+ n.interpolator(e) + n.suffix));
},
complete: function () {
- (o = !0), u();
+ ((o = !0), u());
},
})
: (o = !0),
i.length ||
- (t.node.removeEventListener(Mv, h, !1), (a = !0), u());
- }, 0);
+ (t.node.removeEventListener(Mv, h, !1), (a = !0), u()));
+ }, 0));
}, n.delay || 0);
}))
: (Iv = null);
@@ -8402,7 +8416,7 @@
if (((Yv = 'hidden'), (eg = {}), Yv in document)) Xv = '';
else
for (tg = sa.length; tg--; )
- (Jv = sa[tg]), (Yv = Jv + 'Hidden'), Yv in document && (Xv = Jv);
+ ((Jv = sa[tg]), (Yv = Jv + 'Hidden'), Yv in document && (Xv = Jv));
void 0 !== Xv
? (document.addEventListener(Xv + 'visibilitychange', Wr), Wr())
: ('onfocusout' in document
@@ -8427,26 +8441,26 @@
throw new Error(
't.animateStyle() returns a promise - use .then() instead of passing a callback'
);
- if (og.hidden) return this.setStyle(t, e), sg || (sg = ou.resolve());
- 'string' == typeof t ? ((i = {}), (i[t] = e)) : ((i = t), (n = e)),
+ if (og.hidden) return (this.setStyle(t, e), sg || (sg = ou.resolve()));
+ ('string' == typeof t ? ((i = {}), (i[t] = e)) : ((i = t), (n = e)),
n ||
(v(
'The "%s" transition does not supply an options object to `t.animateStyle()`. This will break in a future version of Ractive. For more info see https://github.com/RactiveJS/Ractive/issues/340',
this.name
),
- (n = this));
+ (n = this)));
var s = new ou(function (t) {
var e, s, o, a, u, h, c;
- if (!n.duration) return r.setStyle(i), void t();
+ if (!n.duration) return (r.setStyle(i), void t());
for (
e = Object.keys(i), s = [], o = rg(r.node), u = {}, h = e.length;
h--;
)
- (c = e[h]),
+ ((c = e[h]),
(a = o[Rv(c)]),
'0px' === a && (a = 0),
- a != i[c] && (s.push(c), (r.node.style[Rv(c)] = a));
+ a != i[c] && (s.push(c), (r.node.style[Rv(c)] = a)));
return s.length ? void ng(r, i, n, s, t) : void t();
});
return s;
@@ -8484,7 +8498,7 @@
fg,
dg = cg,
pg = Qr;
- (lg = function () {
+ ((lg = function () {
var t = this.node,
e = this.fragment.toString(!1);
if (
@@ -8498,13 +8512,13 @@
}
}),
(fg = function () {
- (this.node.type && 'text/javascript' !== this.node.type) ||
+ ((this.node.type && 'text/javascript' !== this.node.type) ||
m(
'Script tag was updated. This does not cause the code to be re-evaluated!',
{ ractive: this.root }
),
- (this.node.text = this.fragment.toString(!1));
- });
+ (this.node.text = this.fragment.toString(!1)));
+ }));
var mg = function () {
var t, e;
return this.template.y
@@ -8584,7 +8598,7 @@
Ag = 'Could not find template for partial "%s"',
Sg = function (t) {
var e, n;
- (e = this.parentFragment = t.parentFragment),
+ ((e = this.parentFragment = t.parentFragment),
(this.root = e.root),
(this.type = tc),
(this.index = t.index),
@@ -8598,7 +8612,7 @@
this.keypath ||
((n = Eg(this.root, this.name, e))
? (Dd.call(this), (this.isNamed = !0), this.setTemplate(n))
- : v(Ag, this.name));
+ : v(Ag, this.name)));
};
Sg.prototype = {
bubble: function () {
@@ -8636,8 +8650,8 @@
return this.fragment.getValue();
},
rebind: function (t, e) {
- this.isNamed || ip.call(this, t, e),
- this.fragment && this.fragment.rebind(t, e);
+ (this.isNamed || ip.call(this, t, e),
+ this.fragment && this.fragment.rebind(t, e));
},
render: function () {
return (
@@ -8663,7 +8677,7 @@
this.rendered && mu.addView(this));
},
setTemplate: function (t) {
- this.fragment &&
+ (this.fragment &&
(this.fragment.unbind(),
this.rendered && (this.fragmentToUnrender = this.fragment)),
(this.fragment = new yb({
@@ -8672,7 +8686,7 @@
owner: this,
pElement: this.parentFragment.pElement,
})),
- (this.fragmentToRender = this.fragment);
+ (this.fragmentToRender = this.fragment));
},
toString: function (t) {
var e, n, i, r;
@@ -8686,7 +8700,7 @@
);
},
unbind: function () {
- this.isNamed || Dd.call(this), this.fragment && this.fragment.unbind();
+ (this.isNamed || Dd.call(this), this.fragment && this.fragment.unbind());
},
unrender: function (t) {
this.rendered &&
@@ -8694,7 +8708,7 @@
},
update: function () {
var t, e;
- this.fragmentToUnrender &&
+ (this.fragmentToUnrender &&
(this.fragmentToUnrender.unrender(!0),
(this.fragmentToUnrender = null)),
this.fragmentToRender &&
@@ -8703,7 +8717,7 @@
this.rendered &&
((t = this.parentFragment.getNode()),
(e = this.parentFragment.findNextNode(this)),
- t.insertBefore(this.docFrag, e));
+ t.insertBefore(this.docFrag, e)));
},
};
var Cg,
@@ -8726,7 +8740,7 @@
},
Wg = [],
zg = ['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'];
- zg.forEach(function (t) {
+ (zg.forEach(function (t) {
var e = function () {
for (var e = arguments.length, n = Array(e), i = 0; e > i; i++)
n[i] = arguments[i];
@@ -8740,10 +8754,10 @@
a--;
)
- (o = this._ractive.wrappers[a]),
+ ((o = this._ractive.wrappers[a]),
mu.addRactive(o.root),
- Ug(o, this, t, r);
- return mu.end(), (this._ractive.setting = !1), s;
+ Ug(o, this, t, r));
+ return (mu.end(), (this._ractive.setting = !1), s);
};
xa(Wg, t, { value: e });
}),
@@ -8758,18 +8772,18 @@
: ((Og = function (t) {
var e, n;
for (e = zg.length; e--; )
- (n = zg[e]), xa(t, n, { value: Wg[n], configurable: !0 });
+ ((n = zg[e]), xa(t, n, { value: Wg[n], configurable: !0 }));
}),
(Pg = function (t) {
var e;
for (e = zg.length; e--; ) delete t[zg[e]];
})),
- (Og.unpatch = Pg);
+ (Og.unpatch = Pg));
var Bg,
qg,
$g,
Qg = Og;
- (Bg = {
+ ((Bg = {
filter: function (t) {
return s(t) && (!t._ractive || !t._ractive.setting);
},
@@ -8778,7 +8792,7 @@
},
}),
(qg = function (t, e, n) {
- (this.root = t),
+ ((this.root = t),
(this.value = e),
(this.keypath = _(n)),
e._ractive ||
@@ -8790,7 +8804,7 @@
e._ractive.instances[t._guid] ||
((e._ractive.instances[t._guid] = 0), e._ractive.instances.push(t)),
(e._ractive.instances[t._guid] += 1),
- e._ractive.wrappers.push(this);
+ e._ractive.wrappers.push(this));
}),
(qg.prototype = {
get: function () {
@@ -8812,10 +8826,10 @@
if (((r = i.indexOf(this.root)), -1 === r)) throw new Error($g);
i.splice(r, 1);
}
- } else delete t._ractive, Qg.unpatch(this.value);
+ } else (delete t._ractive, Qg.unpatch(this.value));
},
}),
- ($g = 'Something went wrong in a rather interesting way');
+ ($g = 'Something went wrong in a rather interesting way'));
var Zg,
Hg,
Kg = Bg,
@@ -8824,7 +8838,7 @@
return Gg.test(t) ? [] : {};
};
try {
- Object.defineProperty({}, 'test', { value: 0 }),
+ (Object.defineProperty({}, 'test', { value: 0 }),
(Zg = {
filter: function (t, e, n) {
var i, r;
@@ -8909,7 +8923,7 @@
(this.obj[this.prop] = n)))
));
},
- });
+ }));
} catch (_a) {
Zg = !1;
}
@@ -8926,17 +8940,17 @@
},
}),
(Xg = function (t, e, n) {
- (this.value = e),
+ ((this.value = e),
(this.magic = !0),
(this.magicWrapper = ty.wrap(t, e, n)),
- (this.arrayWrapper = Kg.wrap(t, e, n));
+ (this.arrayWrapper = Kg.wrap(t, e, n)));
}),
(Xg.prototype = {
get: function () {
return this.value;
},
teardown: function () {
- this.arrayWrapper.teardown(), this.magicWrapper.teardown();
+ (this.arrayWrapper.teardown(), this.magicWrapper.teardown());
},
reset: function (t) {
return this.magicWrapper.reset(t);
@@ -8951,37 +8965,37 @@
ay = Ps,
uy = Ts,
hy = function (t, e) {
- (this.computation = t),
+ ((this.computation = t),
(this.viewmodel = t.viewmodel),
(this.ref = e),
(this.root = this.viewmodel.ractive),
(this.parentFragment =
- this.root.component && this.root.component.parentFragment);
+ this.root.component && this.root.component.parentFragment));
};
hy.prototype = {
resolve: function (t) {
- this.computation.softDeps.push(t),
+ (this.computation.softDeps.push(t),
(this.computation.unresolvedDeps[t.str] = null),
- this.viewmodel.register(t, this.computation, 'computed');
+ this.viewmodel.register(t, this.computation, 'computed'));
},
};
var cy = hy,
ly = function (t, e) {
- (this.key = t),
+ ((this.key = t),
(this.getter = e.getter),
(this.setter = e.setter),
(this.hardDeps = e.deps || []),
(this.softDeps = []),
(this.unresolvedDeps = {}),
(this.depValues = {}),
- (this._dirty = this._firstRun = !0);
+ (this._dirty = this._firstRun = !0));
};
ly.prototype = {
constructor: ly,
init: function (t) {
var e,
n = this;
- (this.viewmodel = t),
+ ((this.viewmodel = t),
(this.bypass = !0),
(e = t.get(this.key)),
t.clearCache(this.key.str),
@@ -8990,7 +9004,7 @@
this.hardDeps &&
this.hardDeps.forEach(function (e) {
return t.register(e, n, 'computed');
- });
+ }));
},
invalidate: function () {
this._dirty = !0;
@@ -9005,7 +9019,7 @@
'The ' +
this.key.str +
" computation indirectly called itself. This probably indicates a bug in the computation. It is commonly caused by `array.sort(...)` - if that's the case, clone the array first with `array.slice().sort(...)`";
- return p(r), this.value;
+ return (p(r), this.value);
}
if (((this.getting = !0), this._dirty)) {
if (
@@ -9020,7 +9034,7 @@
(r = n.viewmodel.get(e)),
!a(r, n.depValues[e.str]))
)
- return (n.depValues[e.str] = r), void (i = !0);
+ return ((n.depValues[e.str] = r), void (i = !0));
}),
i)
) {
@@ -9028,22 +9042,22 @@
try {
this.value = this.getter();
} catch (s) {
- m('Failed to compute "%s"', this.key.str),
+ (m('Failed to compute "%s"', this.key.str),
f(s.stack || s),
- (this.value = void 0);
+ (this.value = void 0));
}
- (t = this.viewmodel.release()),
+ ((t = this.viewmodel.release()),
(e = this.updateDependencies(t)),
e &&
[this.hardDeps, this.softDeps].forEach(function (t) {
t.forEach(function (t) {
n.depValues[t.str] = n.viewmodel.get(t);
});
- });
+ }));
}
this._dirty = !1;
}
- return (this.getting = this._firstRun = !1), this.value;
+ return ((this.getting = this._firstRun = !1), this.value);
},
set: function (t) {
if (this.setting) return void (this.value = t);
@@ -9056,11 +9070,11 @@
updateDependencies: function (t) {
var e, n, i, r, s;
for (n = this.softDeps, e = n.length; e--; )
- (i = n[e]),
+ ((i = n[e]),
-1 === t.indexOf(i) &&
- ((r = !0), this.viewmodel.unregister(i, this, 'computed'));
+ ((r = !0), this.viewmodel.unregister(i, this, 'computed')));
for (e = t.length; e--; )
- (i = t[e]),
+ ((i = t[e]),
-1 !== n.indexOf(i) ||
(this.hardDeps && -1 !== this.hardDeps.indexOf(i)) ||
((r = !0),
@@ -9069,8 +9083,8 @@
t.splice(e, 1),
(this.unresolvedDeps[i.str] = s),
mu.addUnresolved(s))
- : this.viewmodel.register(i, this, 'computed'));
- return r && (this.softDeps = t.slice()), r;
+ : this.viewmodel.register(i, this, 'computed')));
+ return (r && (this.softDeps = t.slice()), r);
},
};
var fy = ly,
@@ -9081,16 +9095,16 @@
gy = Ds,
yy = Is,
by = function (t, e) {
- (this.localKey = t),
+ ((this.localKey = t),
(this.keypath = e.keypath),
(this.origin = e.origin),
(this.deps = []),
(this.unresolved = []),
- (this.resolved = !1);
+ (this.resolved = !1));
};
by.prototype = {
forceResolution: function () {
- (this.keypath = this.localKey), this.setup();
+ ((this.keypath = this.localKey), this.setup());
},
get: function (t, e) {
return this.resolved ? this.origin.get(this.map(t), e) : void 0;
@@ -9099,7 +9113,7 @@
return this.keypath ? this.origin.get(this.keypath) : void 0;
},
initViewmodel: function (t) {
- (this.local = t), this.setup();
+ ((this.local = t), this.setup());
},
map: function (t) {
return void 0 === typeof this.keypath
@@ -9107,16 +9121,17 @@
: t.replace(this.localKey, this.keypath);
},
register: function (t, e, n) {
- this.deps.push({ keypath: t, dep: e, group: n }),
- this.resolved && this.origin.register(this.map(t), e, n);
+ (this.deps.push({ keypath: t, dep: e, group: n }),
+ this.resolved && this.origin.register(this.map(t), e, n));
},
resolve: function (t) {
- void 0 !== this.keypath && this.unbind(!0),
+ (void 0 !== this.keypath && this.unbind(!0),
(this.keypath = t),
- this.setup();
+ this.setup());
},
set: function (t, e) {
- this.resolved || this.forceResolution(), this.origin.set(this.map(t), e);
+ (this.resolved || this.forceResolution(),
+ this.origin.set(this.map(t), e));
},
setup: function () {
var t = this;
@@ -9146,12 +9161,12 @@
},
unbind: function (t) {
var e = this;
- t || delete this.local.mappings[this.localKey],
+ (t || delete this.local.mappings[this.localKey],
this.resolved &&
(this.deps.forEach(function (t) {
e.origin.unregister(e.map(t.keypath), t.dep, t.group);
}),
- this.tracker && this.origin.unregister(this.keypath, this.tracker));
+ this.tracker && this.origin.unregister(this.keypath, this.tracker)));
},
unregister: function (t, e, n) {
var i, r;
@@ -9173,12 +9188,12 @@
(i = 0),
(r = t.map(function (t, r) {
var o, a, u;
- (a = i), (u = e.length);
+ ((a = i), (u = e.length));
do {
- if (((o = e.indexOf(t, a)), -1 === o)) return (s = !0), -1;
+ if (((o = e.indexOf(t, a)), -1 === o)) return ((s = !0), -1);
a = o + 1;
} while (n[o] && u > a);
- return o === i && (i += 1), o !== r && (s = !0), (n[o] = !0), o;
+ return (o === i && (i += 1), o !== r && (s = !0), (n[o] = !0), o);
}))
);
},
@@ -9201,7 +9216,7 @@
s = t.ractive,
o = t.computed,
a = t.mappings;
- (this.ractive = s),
+ ((this.ractive = s),
(this.adaptors = i),
(this.onchange = t.onchange),
(this.cache = {}),
@@ -9218,14 +9233,14 @@
(this.implicitChanges = {}),
(this.noCascade = {}),
(this.data = r),
- (this.mappings = wa(null));
+ (this.mappings = wa(null)));
for (e in a) this.map(_(e), a[e]);
if (r)
for (e in r)
(n = this.mappings[e]) && void 0 === n.getValue() && n.setValue(r[e]);
for (e in o)
- a && e in a && l("Cannot map to a computed property ('%s')", e),
- this.compute(_(e), o[e]);
+ (a && e in a && l("Cannot map to a computed property ('%s')", e),
+ this.compute(_(e), o[e]));
this.ready = !0;
};
jy.prototype = {
@@ -9255,8 +9270,8 @@
},
end: function (t) {
var e = t.parent;
- e && this.inProcess[e._guid] ? Xs(this.queue, e).push(t) : to(this, t),
- delete this.inProcess[t._guid];
+ (e && this.inProcess[e._guid] ? Xs(this.queue, e).push(t) : to(this, t),
+ delete this.inProcess[t._guid]);
},
};
var Dy = Js,
@@ -9283,7 +9298,7 @@
this.dirty || ((this.dirty = !0), mu.addView(this));
},
update: function () {
- this.callback(this.fragment.getValue()), (this.dirty = !1);
+ (this.callback(this.fragment.getValue()), (this.dirty = !1));
},
rebind: function (t, e) {
this.fragment.rebind(t, e);
@@ -9331,11 +9346,11 @@
var i,
r,
o = n[e];
- if ('string' == typeof o) (i = Af(o)), (p[e] = i ? i.value : o);
+ if ('string' == typeof o) ((i = Af(o)), (p[e] = i ? i.value : o));
else if (0 === o) p[e] = !0;
else {
if (!s(o)) throw new Error('erm wut');
- fo(o)
+ (fo(o)
? ((v[e] = { origin: t.root.viewmodel, keypath: void 0 }),
(r = lo(t, o[0], function (t) {
t.isSpecial
@@ -9349,7 +9364,7 @@
: (r = new qy(t, o, function (t) {
f ? a.set(e, t) : (p[e] = t);
})),
- g.push(r);
+ g.push(r));
}
}),
(a = wa(e.prototype)),
@@ -9382,8 +9397,8 @@
Zy = function (t) {
var e, n;
for (e = t.root; e; )
- (n = e._liveComponentQueries['_' + t.name]) && n.push(t.instance),
- (e = e.parent);
+ ((n = e._liveComponentQueries['_' + t.name]) && n.push(t.instance),
+ (e = e.parent));
},
Hy = vo,
Ky = go,
@@ -9412,7 +9427,7 @@
};
var nb = eb,
ib = function (t) {
- (this.type = ec), (this.value = t.template.c);
+ ((this.type = ec), (this.value = t.template.c));
};
ib.prototype = {
detach: Rd,
@@ -9421,7 +9436,8 @@
},
render: function () {
return (
- this.node || (this.node = document.createComment(this.value)), this.node
+ this.node || (this.node = document.createComment(this.value)),
+ this.node
);
},
toString: function () {
@@ -9434,15 +9450,15 @@
var rb = ib,
sb = function (t) {
var e, n;
- (this.type = oc),
+ ((this.type = oc),
(this.container = e = t.parentFragment.root),
(this.component = n = e.component),
(this.container = e),
(this.containerFragment = t.parentFragment),
- (this.parentFragment = n.parentFragment);
+ (this.parentFragment = n.parentFragment));
var i = (this.name = t.template.n || ''),
r = e._inlinePartials[i];
- r ||
+ (r ||
(m('Could not find template for partial "' + i + '"', {
ractive: t.root,
}),
@@ -9461,7 +9477,7 @@
(i ? ' ' + i : '') +
'}} declaration at a time'
);
- });
+ }));
};
sb.prototype = {
detach: function () {
@@ -9495,7 +9511,7 @@
this.fragment.unbind();
},
unrender: function (t) {
- this.fragment.unrender(t), I(this.component.yielders[this.name], this);
+ (this.fragment.unrender(t), I(this.component.yielders[this.name], this));
},
rebind: function (t, e) {
this.fragment.rebind(t, e);
@@ -9564,7 +9580,7 @@
function n(e, i, r) {
(r && r.partials[t]) ||
e.forEach(function (e) {
- e.type === tc && e.getPartialName() === t && i.push(e),
+ (e.type === tc && e.getPartialName() === t && i.push(e),
e.fragment && n(e.fragment.items, i, r),
s(e.fragments)
? n(e.fragments, i, r)
@@ -9575,7 +9591,8 @@
n(e.instance.fragment.items, i, e.instance),
e.type === Xh &&
(s(e.attributes) && n(e.attributes, i, r),
- s(e.conditionalAttributes) && n(e.conditionalAttributes, i, r));
+ s(e.conditionalAttributes) &&
+ n(e.conditionalAttributes, i, r)));
});
}
var i,
@@ -9585,7 +9602,7 @@
(this.partials[t] = e),
(i = mu.start(this, !0)),
r.forEach(function (e) {
- (e.value = void 0), e.setValue(t);
+ ((e.value = void 0), e.setValue(t));
}),
mu.end(),
i
@@ -9677,7 +9694,7 @@
i)
: i;
};
- (vb = function (t) {
+ ((vb = function (t) {
return this instanceof vb ? void By(this, t) : new vb(t);
}),
(gb = {
@@ -9702,7 +9719,7 @@
ka(vb, gb),
(vb.prototype = i(Ub, ua)),
(vb.prototype.constructor = vb),
- (vb.defaults = vb.prototype);
+ (vb.defaults = vb.prototype));
var $b = 'function';
if (
typeof Date.now !== $b ||
diff --git a/src/baseframe/static/js/validate.js b/src/baseframe/static/js/validate.js
index f995a520..f9ffcdbf 100644
--- a/src/baseframe/static/js/validate.js
+++ b/src/baseframe/static/js/validate.js
@@ -77,13 +77,13 @@
this._addField(d, d.names[n]);
else this._addField(d, d.name);
else
- console.warn(
+ (console.warn(
'validate.js: The following field is being skipped due to a misconfiguration:'
),
console.warn(d),
console.warn(
'Check to ensure you have properly configured a name and rules for this field'
- );
+ ));
}
var e = this.form.onsubmit;
this.form.onsubmit = (function (a) {
@@ -305,11 +305,11 @@
d = !1;
a = a.value.replace(/\D/g, '');
for (var f = a.length - 1; 0 <= f; f--)
- (b = a.charAt(f)),
+ ((b = a.charAt(f)),
(b = parseInt(b, 10)),
d && 9 < (b *= 2) && (b -= 9),
(c += b),
- (d = !d);
+ (d = !d));
return 0 === c % 10;
},
is_file_type: function (a, c) {
diff --git a/src/baseframe/static/less/bootstrap/mixins.less b/src/baseframe/static/less/bootstrap/mixins.less
index dd9641db..3a021f14 100644
--- a/src/baseframe/static/less/bootstrap/mixins.less
+++ b/src/baseframe/static/less/bootstrap/mixins.less
@@ -106,11 +106,13 @@
font-family: Georgia, 'Times New Roman', Times, serif;
}
.sans-serif() {
- font-family: 'Source Sans Pro', 'Lucida Grande', 'DejaVu Sans',
+ font-family:
+ 'Source Sans Pro', 'Lucida Grande', 'DejaVu Sans',
'Bitstream Vera Sans', Arial, sans-serif;
}
.monospace() {
- font-family: Consolas, Inconsolata, Menlo, 'DejaVu Sans Mono',
+ font-family:
+ Consolas, Inconsolata, Menlo, 'DejaVu Sans Mono',
'Bitstream Vera Sans Mono', monospace;
}
}
diff --git a/src/baseframe/static/sass/mui/_custom.scss b/src/baseframe/static/sass/mui/_custom.scss
index caec54a2..af8bcd8a 100644
--- a/src/baseframe/static/sass/mui/_custom.scss
+++ b/src/baseframe/static/sass/mui/_custom.scss
@@ -36,9 +36,10 @@ $mui-body-bg-color: $mui-bg-color-accent !default;
$mui-btn-danger-bg-color: $mui-text-danger;
$mui-base-font-color: $mui-text-dark !default;
-$mui-base-font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
- Oxygen, Ubuntu, Cantarell, 'Helvetica Neue', Arial, sans-serif,
- 'Noto Sans Math', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
+$mui-base-font-family:
+ -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu,
+ Cantarell, 'Helvetica Neue', Arial, sans-serif, 'Noto Sans Math',
+ 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
$mui-base-font-size: 14px !default;
$mui-base-font-size-desktop: 16px !default;
$mui-base-font-weight: 400 !default;
diff --git a/src/baseframe/static/sass/rrssb.scss b/src/baseframe/static/sass/rrssb.scss
index ffc5b129..d1db1ebc 100644
--- a/src/baseframe/static/sass/rrssb.scss
+++ b/src/baseframe/static/sass/rrssb.scss
@@ -40,8 +40,9 @@ $rrssb-vk: #4d71a9 !default;
$rrssb-border-radius: 2px !default;
// $rrssb-main-font: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
-$rrssb-main-font: 'Source Sans Pro', 'HelveticaNeue', 'Helvetica Neue',
- Helvetica, Arial, 'Lucida Grande', sans-serif !default;
+$rrssb-main-font:
+ 'Source Sans Pro', 'HelveticaNeue', 'Helvetica Neue', Helvetica, Arial,
+ 'Lucida Grande', sans-serif !default;
// Variable list for all social button colors to be iterated over.
$social-list: (
diff --git a/src/baseframe/statsd.py b/src/baseframe/statsd.py
index 2f9a102c..b850d38f 100644
--- a/src/baseframe/statsd.py
+++ b/src/baseframe/statsd.py
@@ -206,7 +206,7 @@ def gauge(
delta=delta,
)
- def set( # noqa: A003
+ def set(
self,
stat: str,
value: str,
@@ -258,14 +258,14 @@ def _request_finished(self, app: Flask, response: Response) -> None:
self.incr(metric_name, tags=tags)
@staticmethod
- def _before_render_template(app: Flask, template: Template, **kwargs) -> None:
+ def _before_render_template(app: Flask, template: Template, **_kwargs) -> None:
"""Record start time when rendering a template."""
if app.config['STATSD_RATE'] != 0:
if not hasattr(g, TEMPLATE_START_TIME_ATTR):
setattr(g, TEMPLATE_START_TIME_ATTR, {})
getattr(g, TEMPLATE_START_TIME_ATTR)[template] = time.time()
- def _template_rendered(self, app: Flask, template: Template, **kwargs) -> None:
+ def _template_rendered(self, app: Flask, template: Template, **_kwargs) -> None:
"""Calculate time to render a template and log to statsd."""
start_time = getattr(g, TEMPLATE_START_TIME_ATTR, {}).get(template)
if not start_time:
diff --git a/src/baseframe/utils.py b/src/baseframe/utils.py
index 3b23b5c8..a2f88241 100644
--- a/src/baseframe/utils.py
+++ b/src/baseframe/utils.py
@@ -27,12 +27,12 @@
__all__ = [
'MxLookupError',
- 'request_timestamp',
'is_public_email_domain',
- 'localized_country_list',
'localize_timezone',
- 'request_is_xhr',
+ 'localized_country_list',
'request_checked_xhr',
+ 'request_is_xhr',
+ 'request_timestamp',
]
@@ -105,9 +105,7 @@ def is_public_email_domain(
raise
return default
- if any(p['public'] for p in sniffedmx['providers']):
- return True
- return False
+ return bool(any(p['public'] for p in sniffedmx['providers']))
def localized_country_list() -> list[tuple[str, str]]:
diff --git a/src/baseframe/views.py b/src/baseframe/views.py
index 7c672952..240a4bf5 100644
--- a/src/baseframe/views.py
+++ b/src/baseframe/views.py
@@ -1,4 +1,5 @@
"""Baseframe views and view support helpers."""
+# ruff: noqa: ARG001
import os
import os.path
@@ -115,16 +116,14 @@ def asset_path(bundle_key: str) -> str:
@baseframe.app_context_processor
def baseframe_context() -> dict[str, Any]:
"""Add Baseframe helper functions to Jinja2 template context."""
- return {
- 'networkbar_links': networkbar_links,
- 'asset_path': asset_path,
- }
+ return {'networkbar_links': networkbar_links, 'asset_path': asset_path}
@baseframe.route('/favicon.ico', subdomain='
')
@baseframe.route('/favicon.ico', defaults={'subdomain': None})
def favicon(subdomain: Optional[str] = None) -> Response:
"""Render a favicon from the app's static folder, falling back to default icon."""
+ app_icon_path: Optional[str] = None
app_icon_folder = current_app.static_folder
# Does the app have a favicon.ico in /static?
if not os.path.exists(
@@ -132,13 +131,17 @@ def favicon(subdomain: Optional[str] = None) -> Response:
):
# Nope? Is it in /static/img?
app_icon_path = os.path.join(
- current_app.static_folder, 'img' # type: ignore[arg-type]
+ current_app.static_folder or '',
+ 'img',
)
if not os.path.exists(os.path.join(app_icon_path, 'favicon.ico')):
# Still nope? Serve default favicon from baseframe
app_icon_path = os.path.join(
- baseframe.static_folder, 'img' # type: ignore[arg-type]
+ baseframe.static_folder or '',
+ 'img',
)
+ if not app_icon_path:
+ abort(404)
return send_from_directory(
app_icon_path, 'favicon.ico', mimetype='image/vnd.microsoft.icon'
)
@@ -153,7 +156,8 @@ def humans(subdomain: Optional[str] = None) -> Response:
current_app.static_folder
if os.path.exists(
os.path.join(
- current_app.static_folder, 'humans.txt' # type: ignore[arg-type]
+ current_app.static_folder or '',
+ 'humans.txt', # type: ignore[arg-type]
)
)
else baseframe.static_folder
@@ -172,7 +176,8 @@ def robots(subdomain: Optional[str] = None) -> Response:
current_app.static_folder
if os.path.exists(
os.path.join(
- current_app.static_folder, 'robots.txt' # type: ignore[arg-type]
+ current_app.static_folder or '',
+ 'robots.txt', # type: ignore[arg-type]
)
)
else baseframe.static_folder
@@ -187,7 +192,8 @@ def robots(subdomain: Optional[str] = None) -> Response:
def well_known(filename: str, subdomain: Optional[str] = None) -> Response:
"""Render .well-known folder contents from app's static folder."""
well_known_path = os.path.join(
- current_app.static_folder, '.well-known' # type: ignore[arg-type]
+ current_app.static_folder or '',
+ '.well-known', # type: ignore[arg-type]
)
return send_from_directory(well_known_path, filename)
@@ -223,11 +229,10 @@ def csrf_refresh(subdomain: Optional[str] = None) -> ReturnRenderWith:
"""Serve a refreshed CSRF token to ensure HTML forms never expire."""
parsed_host = urlparse(request.url_root)
origin = parsed_host.scheme + '://' + parsed_host.netloc
- if 'Origin' in request.headers:
- # Origin is present in (a) cross-site requests and (b) same site requests in
- # some browsers. Therefore, if Origin is present, confirm it matches our domain.
- if request.headers['Origin'] != origin:
- abort(403)
+ # Origin is present in (a) cross-site requests and (b) same site requests in some
+ # browsers. Therefore, if Origin is present, confirm it matches our domain
+ if 'Origin' in request.headers and request.headers['Origin'] != origin:
+ abort(403)
return (
{'csrf_token': generate_csrf()},
@@ -245,12 +250,14 @@ def csrf_refresh(subdomain: Optional[str] = None) -> ReturnRenderWith:
@baseframe.after_app_request
def process_response(response: Response) -> Response:
"""Process response objects to add additional headers."""
- if request.endpoint in ('static', 'baseframe.static'):
- if 'Access-Control-Allow-Origin' not in response.headers:
- # This is required for webfont resources
- # Note: We do not serve static assets in production, nginx does.
- # That means this piece of code will never be called in production.
- response.headers['Access-Control-Allow-Origin'] = '*'
+ if (
+ request.endpoint in ('static', 'baseframe.static')
+ and 'Access-Control-Allow-Origin' not in response.headers
+ ):
+ # This is required for webfont resources
+ # Note: We do not serve static assets in production, nginx does.
+ # That means this piece of code will never be called in production.
+ response.headers['Access-Control-Allow-Origin'] = '*'
# If Babel was accessed in this request, the response's contents will vary with
# the accepted language
@@ -273,10 +280,9 @@ def process_response(response: Response) -> Response:
# 'ALLOW' is an unofficial signal from the app to Baseframe.
# It signals us to remove the header and not set a default
response.headers.pop('X-Frame-Options')
- else:
- if request_has_auth() and getattr(current_auth, 'login_required', False):
- # Protect only login_required pages from appearing in frames
- response.headers['X-Frame-Options'] = 'SAMEORIGIN'
+ elif request_has_auth() and getattr(current_auth, 'login_required', False):
+ # Protect only login_required pages from appearing in frames
+ response.headers['X-Frame-Options'] = 'SAMEORIGIN'
# In memoriam. http://www.gnuterrypratchett.com/
response.headers['X-Clacks-Overhead'] = 'GNU Terry Pratchett'
diff --git a/tests/baseframe_tests/__init__.py b/tests/baseframe_tests/__init__.py
index e69de29b..b0dd0a94 100644
--- a/tests/baseframe_tests/__init__.py
+++ b/tests/baseframe_tests/__init__.py
@@ -0,0 +1 @@
+"""Baseframe tests."""
diff --git a/tests/baseframe_tests/conftest.py b/tests/baseframe_tests/conftest.py
index 46a692e2..be113cc3 100644
--- a/tests/baseframe_tests/conftest.py
+++ b/tests/baseframe_tests/conftest.py
@@ -1,31 +1,34 @@
"""Test configuration."""
-
# pylint: disable=redefined-outer-name
+from collections.abc import Generator
+
import pytest
from flask import Flask
+from flask.ctx import AppContext
+from flask.testing import FlaskClient
from baseframe import baseframe
@pytest.fixture
-def app():
+def app() -> Flask:
"""App fixture."""
fixture_app = Flask(__name__)
fixture_app.config['CACHE_TYPE'] = 'SimpleCache'
- fixture_app.config['SECRET_KEY'] = 'test secret' # nosec
+ fixture_app.config['SECRET_KEY'] = 'test secret' # nosec: B105 # noqa: S105
baseframe.init_app(fixture_app, requires=['baseframe'])
return fixture_app
@pytest.fixture
-def ctx(app):
+def ctx(app: Flask) -> Generator[AppContext, None, None]:
with app.app_context() as context:
yield context
@pytest.fixture
-def client(app):
+def client(app: Flask) -> Generator[FlaskClient, None, None]:
"""App client fixture."""
with app.test_client() as test_client:
yield test_client
diff --git a/tests/baseframe_tests/filters_test.py b/tests/baseframe_tests/filters_test.py
index a4c58216..be453e35 100644
--- a/tests/baseframe_tests/filters_test.py
+++ b/tests/baseframe_tests/filters_test.py
@@ -7,6 +7,7 @@
from typing import Optional
import pytest
+from flask import Flask
from pytz import UTC, timezone
from coaster.utils import md5sum
@@ -15,7 +16,7 @@
@pytest.fixture(params=[True, False])
-def times(request):
+def times(request: pytest.FixtureRequest) -> SimpleNamespace:
"""Sample times fixture."""
now = datetime.now(UTC) if request.param else datetime.utcnow()
return SimpleNamespace(
@@ -27,7 +28,7 @@ def times(request):
)
-def test_dt_filters_age(times) -> None:
+def test_dt_filters_age(times: SimpleNamespace) -> None:
age = filters.age(times.now)
assert age == 'now'
@@ -52,14 +53,18 @@ def test_dt_filters_age(times) -> None:
assert age == '2 years ago'
-def test_dt_filters_shortdate_date_with_threshold(app, times) -> None:
+def test_dt_filters_shortdate_date_with_threshold(
+ app: Flask, times: SimpleNamespace
+) -> None:
app.config['SHORTDATE_THRESHOLD_DAYS'] = 10
testdate = times.now.date() - timedelta(days=5)
with app.test_request_context('/'):
assert filters.shortdate(testdate) == testdate.strftime('%e %b')
-def test_dt_filters_shortdate_date_without_threshold(app, times) -> None:
+def test_dt_filters_shortdate_date_without_threshold(
+ app: Flask, times: SimpleNamespace
+) -> None:
app.config['SHORTDATE_THRESHOLD_DAYS'] = 0
testdate = times.now.date() - timedelta(days=5)
with app.test_request_context('/'):
@@ -68,14 +73,18 @@ def test_dt_filters_shortdate_date_without_threshold(app, times) -> None:
)
-def test_dt_filters_shortdate_datetime_with_threshold(app, times) -> None:
+def test_dt_filters_shortdate_datetime_with_threshold(
+ app: Flask, times: SimpleNamespace
+) -> None:
app.config['SHORTDATE_THRESHOLD_DAYS'] = 10
testdate = times.now - timedelta(days=5)
with app.test_request_context('/'):
assert filters.shortdate(testdate) == testdate.strftime('%e %b')
-def test_dt_filters_shortdate_datetime_without_threshold(app, times) -> None:
+def test_dt_filters_shortdate_datetime_without_threshold(
+ app: Flask, times: SimpleNamespace
+) -> None:
testdate = times.now - timedelta(days=5)
with app.test_request_context('/'):
assert filters.shortdate(testdate).replace("’", "'") == testdate.strftime(
@@ -83,7 +92,9 @@ def test_dt_filters_shortdate_datetime_without_threshold(app, times) -> None:
)
-def test_dt_filters_shortdate_datetime_with_tz(app, times) -> None:
+def test_dt_filters_shortdate_datetime_with_tz(
+ app: Flask, times: SimpleNamespace
+) -> None:
testdate = times.now
with app.test_request_context('/'):
assert filters.shortdate(testdate).replace("’", "'") == testdate.strftime(
@@ -91,47 +102,53 @@ def test_dt_filters_shortdate_datetime_with_tz(app, times) -> None:
)
-def test_dt_filters_longdate_date(app, times) -> None:
+def test_dt_filters_longdate_date(app: Flask, times: SimpleNamespace) -> None:
testdate = times.now.date()
with app.test_request_context('/'):
assert filters.longdate(testdate) == testdate.strftime('%e %B %Y')
-def test_dt_filters_longdate_datetime(app, times) -> None:
+def test_dt_filters_longdate_datetime(app: Flask, times: SimpleNamespace) -> None:
testdate = times.now
with app.test_request_context('/'):
assert filters.longdate(testdate) == testdate.strftime('%e %B %Y')
-def test_dt_filters_longdate_datetime_with_tz(app, times) -> None:
+def test_dt_filters_longdate_datetime_with_tz(
+ app: Flask, times: SimpleNamespace
+) -> None:
testdate = times.now
with app.test_request_context('/'):
assert filters.longdate(testdate) == testdate.strftime('%e %B %Y')
-def test_dt_filters_date_filter(app, times) -> None:
+def test_dt_filters_date_filter(app: Flask, times: SimpleNamespace) -> None:
with app.test_request_context('/'):
assert (
filters.date_filter(times.date, 'yyyy-MM-dd', usertz=False) == '2020-01-31'
)
-def test_dt_filters_date_localized_short_hi(app, times) -> None:
+def test_dt_filters_date_localized_short_hi(app: Flask, times: SimpleNamespace) -> None:
with app.test_request_context('/', headers={'Accept-Language': 'hi'}):
assert filters.date_filter(times.date, format='short') == '31/1/20'
-def test_dt_filters_date_localized_medium_hi(app, times) -> None:
+def test_dt_filters_date_localized_medium_hi(
+ app: Flask, times: SimpleNamespace
+) -> None:
with app.test_request_context('/', headers={'Accept-Language': 'hi'}):
assert filters.date_filter(times.date, format='medium') == '31 जन॰ 2020'
-def test_dt_filters_date_localized_long_hi(app, times) -> None:
+def test_dt_filters_date_localized_long_hi(app: Flask, times: SimpleNamespace) -> None:
with app.test_request_context('/', headers={'Accept-Language': 'hi'}):
assert filters.date_filter(times.date, format='long') == '31 जनवरी 2020'
-def test_dt_filters_time_localized_hi_medium(app, times) -> None:
+def test_dt_filters_time_localized_hi_medium(
+ app: Flask, times: SimpleNamespace
+) -> None:
with app.test_request_context('/', headers={'Accept-Language': 'hi'}):
assert (
filters.datetime_filter(times.datetime, format='medium')
@@ -139,32 +156,32 @@ def test_dt_filters_time_localized_hi_medium(app, times) -> None:
)
-def test_dt_filters_month_localized_hi(app, times) -> None:
+def test_dt_filters_month_localized_hi(app: Flask, times: SimpleNamespace) -> None:
with app.test_request_context('/', headers={'Accept-Language': 'hi'}):
assert filters.date_filter(times.date, "MMMM") == 'जनवरी'
-def test_dt_filters_month_localized_en(app, times) -> None:
+def test_dt_filters_month_localized_en(app: Flask, times: SimpleNamespace) -> None:
with app.test_request_context('/'):
assert filters.date_filter(times.date, "MMMM") == 'January'
-def test_dt_filters_time_localized_short(app, times) -> None:
+def test_dt_filters_time_localized_short(app: Flask, times: SimpleNamespace) -> None:
with app.test_request_context('/', headers={'Accept-Language': 'hi'}):
assert filters.time_filter(times.datetime, format='short') == '12:00 am'
-def test_dt_filters_time_localized_medium(app, times) -> None:
+def test_dt_filters_time_localized_medium(app: Flask, times: SimpleNamespace) -> None:
with app.test_request_context('/', headers={'Accept-Language': 'hi'}):
assert filters.time_filter(times.datetime, format='medium') == '12:00:00 am'
-def test_dt_filters_time_localized_long(app, times) -> None:
+def test_dt_filters_time_localized_long(app: Flask, times: SimpleNamespace) -> None:
with app.test_request_context('/', headers={'Accept-Language': 'hi'}):
assert filters.time_filter(times.datetime, format='long') == '12:00:00 am UTC'
-def test_dt_filters_time_localized_hi_full(app, times) -> None:
+def test_dt_filters_time_localized_hi_full(app: Flask, times: SimpleNamespace) -> None:
with app.test_request_context('/', headers={'Accept-Language': 'hi'}):
assert (
filters.time_filter(times.time, format='full')
@@ -172,7 +189,7 @@ def test_dt_filters_time_localized_hi_full(app, times) -> None:
)
-def test_dt_filters_time_localized_en_full(app, times) -> None:
+def test_dt_filters_time_localized_en_full(app: Flask, times: SimpleNamespace) -> None:
with app.test_request_context('/', headers={'Accept-Language': 'en'}):
assert filters.time_filter(times.time, format='full') in (
'11:59:59 PM Coordinated Universal Time',
@@ -180,7 +197,7 @@ def test_dt_filters_time_localized_en_full(app, times) -> None:
)
-def test_dt_filters_datetime_with_usertz(app, times) -> None:
+def test_dt_filters_datetime_with_usertz(app: Flask, times: SimpleNamespace) -> None:
with app.test_request_context('/'):
assert filters.datetime_filter(
times.datetimeEST, format='full', usertz=False
@@ -190,7 +207,7 @@ def test_dt_filters_datetime_with_usertz(app, times) -> None:
)
-def test_dt_filters_datetime_without_usertz(app, times) -> None:
+def test_dt_filters_datetime_without_usertz(app: Flask, times: SimpleNamespace) -> None:
with app.test_request_context('/'):
assert filters.datetime_filter(
times.datetimeEST, format='full', usertz=True
@@ -200,7 +217,7 @@ def test_dt_filters_datetime_without_usertz(app, times) -> None:
)
-def test_dt_filters_date_dmy(app, times) -> None:
+def test_dt_filters_date_dmy(app: Flask, times: SimpleNamespace) -> None:
with app.test_request_context('/'):
assert (
filters.date_filter(times.datetime, format='short', locale='en_GB')
@@ -208,7 +225,7 @@ def test_dt_filters_date_dmy(app, times) -> None:
)
-def test_dt_filters_date_mdy(app, times) -> None:
+def test_dt_filters_date_mdy(app: Flask, times: SimpleNamespace) -> None:
with app.test_request_context('/'):
assert (
filters.date_filter(times.datetime, format='short', locale='en_US')
@@ -216,12 +233,12 @@ def test_dt_filters_date_mdy(app, times) -> None:
)
-def test_dt_filters_timestamp(app, times) -> None:
+def test_dt_filters_timestamp(app: Flask, times: SimpleNamespace) -> None:
with app.test_request_context('/'):
assert filters.timestamp_filter(times.datetime) == 1580428800.0
-def test_dt_filters_timestamp_filter(app, times) -> None:
+def test_dt_filters_timestamp_filter(app: Flask, times: SimpleNamespace) -> None:
with app.test_request_context('/'):
assert filters.timedelta_filter(times.now) == "1 second ago"
assert filters.timedelta_filter(1) == "1 second"
@@ -237,12 +254,12 @@ def test_dt_filters_timestamp_filter(app, times) -> None:
filters.timedelta_filter(timedelta(days=1), add_direction=True)
== "in 1 day"
)
- # Narrow format doesn't work for add_direction
+ # Narrow format works for add_direction in English
assert (
filters.timedelta_filter(
timedelta(days=1), format='narrow', add_direction=True
)
- == "in 1 day"
+ == "in 1d"
)
assert (
filters.timedelta_filter(-timedelta(seconds=1), add_direction=True)
@@ -252,16 +269,16 @@ def test_dt_filters_timestamp_filter(app, times) -> None:
filters.timedelta_filter(-timedelta(days=1), add_direction=True)
== "1 day ago"
)
- # Narrow format doesn't work for add_direction
+ # Narrow format works for add_direction in English
assert (
filters.timedelta_filter(
-timedelta(days=1), format='narrow', add_direction=True
)
- == "1 day ago"
+ == "1d ago"
)
-def test_dt_filters_timestamp_filter_hi(app, times) -> None:
+def test_dt_filters_timestamp_filter_hi(app: Flask, times: SimpleNamespace) -> None:
with app.test_request_context('/', headers={'Accept-Language': 'hi'}):
assert filters.timedelta_filter(times.now) == "1 सेकंड पहले"
assert filters.timedelta_filter(1) == "1 सेकंड"
@@ -279,7 +296,7 @@ def test_dt_filters_timestamp_filter_hi(app, times) -> None:
assert (
filters.timedelta_filter(timedelta(days=1), add_direction=True) == "1 दिन में"
)
- # Narrow format doesn't work for add_direction
+ # Narrow format doesn't work for add_direction in Hindi
assert (
filters.timedelta_filter(
timedelta(days=1), format='narrow', add_direction=True
@@ -294,7 +311,7 @@ def test_dt_filters_timestamp_filter_hi(app, times) -> None:
filters.timedelta_filter(-timedelta(days=1), add_direction=True)
== "1 दिन पहले"
)
- # Narrow format doesn't work for add_direction
+ # Narrow format doesn't work for add_direction in Hindi
assert (
filters.timedelta_filter(
-timedelta(days=1), format='narrow', add_direction=True
@@ -329,7 +346,7 @@ def test_initials() -> None:
assert initial == ''
-def test_usessl(app) -> None:
+def test_usessl(app: Flask) -> None:
with app.test_request_context('/'):
app.config['USE_SSL'] = False
ssled = filters.usessl('http://hasgeek.com')
@@ -346,7 +363,7 @@ def test_usessl(app) -> None:
assert ssled == 'https://localhost/static/test'
-def test_nossl(app) -> None:
+def test_nossl(app: Flask) -> None:
with app.test_request_context('/'):
nossled = filters.nossl('https://hasgeek.com')
assert nossled == 'http://hasgeek.com'
@@ -438,9 +455,8 @@ def test_preview() -> None:
== "Hello all, Here is …"
)
# Strips HTML tags and attributes when returning text
- assert (
- filters.preview(
- """
+ assert filters.preview(
+ """
Example.org is a reserved TLD
for tests.
@@ -449,11 +465,9 @@ def test_preview() -> None:
Anyone may use it for any example use case.
"""
- )
- == (
- "Example.org is a reserved TLD for tests."
- " Anyone may use it for any example use case."
- )
+ ) == (
+ "Example.org is a reserved TLD for tests."
+ " Anyone may use it for any example use case."
)
# Counts by Unicode graphemes, not code points, to avoid mangling letters
assert filters.preview('हिंदी टायपिंग', min=1, max=3) == 'हिंदी…'
diff --git a/tests/baseframe_tests/forms/__init__.py b/tests/baseframe_tests/forms/__init__.py
new file mode 100644
index 00000000..c141d5e4
--- /dev/null
+++ b/tests/baseframe_tests/forms/__init__.py
@@ -0,0 +1 @@
+"""Baseframe form tests."""
diff --git a/tests/baseframe_tests/forms/fields_test.py b/tests/baseframe_tests/forms/fields_test.py
index 8d9ef06b..f6fad229 100644
--- a/tests/baseframe_tests/forms/fields_test.py
+++ b/tests/baseframe_tests/forms/fields_test.py
@@ -6,6 +6,7 @@
from decimal import Decimal
import pytest
+from flask.ctx import AppContext
from pytz import timezone, utc
from werkzeug.datastructures import MultiDict
@@ -48,7 +49,7 @@ class DateTimeForm(forms.Form):
@pytest.fixture
-def enum_form(ctx):
+def enum_form(ctx: AppContext) -> EnumForm:
"""Enum form fixture."""
return EnumForm(meta={'csrf': False})
@@ -89,30 +90,30 @@ def test_enum_render(enum_form) -> None:
@pytest.fixture
-def json_form(ctx):
+def json_form(ctx: AppContext) -> JsonForm:
"""JSON form fixture."""
return JsonForm(meta={'csrf': False})
-def test_json_default(json_form) -> None:
+def test_json_default(json_form: JsonForm) -> None:
assert json_form.jsondata.data == DEFAULT_JSONDATA
assert json_form.jsondata_empty_default.data == {}
assert json_form.jsondata_no_default.data is None
-def test_json_valid(json_form) -> None:
+def test_json_valid(json_form: JsonForm) -> None:
json_form.process(formdata=MultiDict({'jsondata': '{"key": "val"}'}))
assert json_form.validate() is True
-def test_json_invalid(json_form) -> None:
+def test_json_invalid(json_form: JsonForm) -> None:
json_form.process(
formdata=MultiDict({'jsondata': '{"key"; "val"}'})
) # invalid JSON
assert json_form.validate() is False
-def test_json_empty_default(json_form) -> None:
+def test_json_empty_default(json_form: JsonForm) -> None:
json_form.process(
formdata=MultiDict(
{
@@ -127,7 +128,7 @@ def test_json_empty_default(json_form) -> None:
assert json_form.jsondata_no_default.data is None
-def test_json_nondict(json_form) -> None:
+def test_json_nondict(json_form: JsonForm) -> None:
json_form.process(formdata=MultiDict({'jsondata': '43'}))
assert json_form.validate() is False
json_form.process(formdata=MultiDict({'jsondata': 'true'}))
@@ -139,18 +140,18 @@ def test_json_nondict(json_form) -> None:
assert json_form.validate() is True
-def test_json_unicode(json_form) -> None:
+def test_json_unicode(json_form: JsonForm) -> None:
json_form.process(formdata=MultiDict({'jsondata': '{"key": "val😡"}'}))
assert json_form.validate() is True
assert json_form.jsondata.data == {"key": "val😡"}
-def test_json_unicode_dumps(json_form) -> None:
+def test_json_unicode_dumps(json_form: JsonForm) -> None:
json_form.jsondata.data = {"key": "val😡"}
assert json_form.jsondata._value() == '{\n "key": "val😡"\n}'
-def test_json_decimal(json_form) -> None:
+def test_json_decimal(json_form: JsonForm) -> None:
json_form.jsondata.data = {"key": Decimal('1.2')}
assert json_form.validate() is True
assert json_form.jsondata._value() == '{\n "key": "1.2"\n}'
@@ -164,7 +165,7 @@ def test_json_decimal(json_form) -> None:
assert json_form.jsondata.data == {"key": 1.2}
-def test_json_array(json_form) -> None:
+def test_json_array(json_form: JsonForm) -> None:
json_form.process(
formdata=MultiDict({'jsondata': '[{"key": "val"}, {"key2": "val2"}]'})
)
@@ -177,7 +178,7 @@ def test_json_array(json_form) -> None:
assert json_form.jsondata_no_dict.data == [{"key": "val"}, {"key2": "val2"}]
-def test_json_comment(json_form) -> None:
+def test_json_comment(json_form: JsonForm) -> None:
json_form.process(
formdata=MultiDict(
{
@@ -192,7 +193,7 @@ def test_json_comment(json_form) -> None:
assert json_form.validate() is False
-def test_json_non_serializable(json_form) -> None:
+def test_json_non_serializable(json_form: JsonForm) -> None:
json_form.jsondata.data = {"key": complex(1, 2)}
with pytest.raises(TypeError):
json_form.jsondata._value()
@@ -321,7 +322,7 @@ def test_date_time_field(test_input, expected_naive, expected_aware) -> None:
'100000-01-01',
],
)
-def test_date_time_field_badvalue(test_input) -> None:
+def test_date_time_field_badvalue(test_input: str) -> None:
"""Assert bad datetime input is recorded as a ValidationError."""
form = DateTimeForm(meta={'csrf': False})
form.process(formdata=MultiDict({'naive': test_input, 'aware': test_input}))
diff --git a/tests/baseframe_tests/forms/form_test.py b/tests/baseframe_tests/forms/form_test.py
index 96ca6fea..6487bd03 100644
--- a/tests/baseframe_tests/forms/form_test.py
+++ b/tests/baseframe_tests/forms/form_test.py
@@ -1,6 +1,8 @@
"""Test forms."""
-
# pylint: disable=redefined-outer-name
+# ruff: noqa: ARG002
+
+from typing import Any
import pytest
from werkzeug.datastructures import MultiDict
@@ -17,7 +19,7 @@ class SimpleUser:
company: str
pw_hash: str
- def _set_password(self, value: str):
+ def _set_password(self, value: str) -> None:
self.pw_hash = str(password_hash(value))
password = property(fset=_set_password)
@@ -38,40 +40,41 @@ class GetSetForm(forms.Form):
password = forms.PasswordField("Password")
confirm_password = forms.PasswordField("Confirm password")
- def get_firstname(self, obj):
+ def get_firstname(self, obj: SimpleUser) -> str:
return obj.fullname.split(' ', 1)[0]
- def get_lastname(self, obj):
+ def get_lastname(self, obj: SimpleUser) -> str:
parts = obj.fullname.split(' ', 1)
if len(parts) > 1:
return parts[-1]
return ''
- def get_password(self, obj):
+ def get_password(self, obj: SimpleUser) -> str:
return ''
- def get_confirm_password(self, obj):
+ def get_confirm_password(self, obj: SimpleUser) -> str:
return ''
- def set_firstname(self, obj):
+ def set_firstname(self, obj: SimpleUser) -> None:
pass
- def set_lastname(self, obj):
- obj.fullname = self.firstname.data + " " + self.lastname.data
+ def set_lastname(self, obj: SimpleUser) -> None:
+ obj.fullname = (self.firstname.data or '') + " " + (self.lastname.data or '')
- def set_password(self, obj):
+ def set_password(self, obj: SimpleUser) -> None:
obj.password = self.password.data
- def set_confirm_password(self, obj):
+ def set_confirm_password(self, obj: SimpleUser) -> None:
pass
class InitOrderForm(forms.Form):
__expects__ = ('expected_item',)
+ expected_item: Any
has_context = forms.StringField("Has context")
- def get_has_context(self, obj):
+ def get_has_context(self, obj: Any) -> Any:
return self.expected_item
@@ -82,7 +85,9 @@ class FieldRenderForm(forms.Form):
@pytest.fixture
def user() -> SimpleUser:
return SimpleUser( # nosec
- fullname="Test user", company="Test company", password="test"
+ fullname="Test user",
+ company="Test company",
+ password="test", # noqa: S106
)
@@ -216,7 +221,7 @@ def __post_init__(self) -> None:
@pytest.mark.usefixtures('ctx')
def test_set_queries_gets_called() -> None:
- with pytest.warns(UserWarning):
+ with pytest.warns(UserWarning, match='is deprecated'):
class TestForm(forms.Form):
set_queries_called: bool = False
@@ -230,7 +235,7 @@ def set_queries(self) -> None:
@pytest.mark.usefixtures('ctx')
def test_only_post_init_called() -> None:
- with pytest.warns(UserWarning):
+ with pytest.warns(UserWarning, match='is deprecated'):
class TestForm(forms.Form):
post_init_called: bool = False
diff --git a/tests/baseframe_tests/forms/sqlalchemy_test.py b/tests/baseframe_tests/forms/sqlalchemy_test.py
index 4130d2ec..b0478935 100644
--- a/tests/baseframe_tests/forms/sqlalchemy_test.py
+++ b/tests/baseframe_tests/forms/sqlalchemy_test.py
@@ -2,9 +2,13 @@
# pylint: disable=redefined-outer-name
+from collections.abc import Generator
+
import pytest
+from flask import Flask
+from flask.ctx import AppContext
from flask_sqlalchemy import SQLAlchemy
-from sqlalchemy.orm import DeclarativeBase
+from sqlalchemy.orm import DeclarativeBase, scoped_session
from coaster.sqlalchemy import ModelBase, Query
@@ -40,7 +44,7 @@ class DocumentForm(forms.Form):
@pytest.fixture
-def database(app):
+def database(app: Flask) -> Generator[SQLAlchemy, None, None]:
"""Database structure."""
app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite://'
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
@@ -53,7 +57,7 @@ def database(app):
@pytest.fixture
-def db_session(database):
+def db_session(database: SQLAlchemy) -> Generator[scoped_session, None, None]:
"""Database session fixture."""
savepoint = database.session.begin_nested()
yield database.session
@@ -62,11 +66,11 @@ def db_session(database):
@pytest.fixture
-def form(ctx):
+def form(ctx: AppContext) -> DocumentForm:
return DocumentForm(model=Document, meta={'csrf': False})
-def test_available_attr(form, db_session) -> None:
+def test_available_attr(form: DocumentForm, db_session: scoped_session) -> None:
"""Test AvailableAttr SQLAlchemy validator."""
d1 = Document()
form.process(name='d1', title='t1')
diff --git a/tests/baseframe_tests/forms/validators_test.py b/tests/baseframe_tests/forms/validators_test.py
index 1c3e8f7a..96174ccf 100644
--- a/tests/baseframe_tests/forms/validators_test.py
+++ b/tests/baseframe_tests/forms/validators_test.py
@@ -4,12 +4,15 @@
import re
import warnings
+from collections.abc import Generator
from types import SimpleNamespace
from typing import Any
import pytest
import requests_mock
import urllib3
+from flask import Flask
+from flask.ctx import AppContext
from werkzeug.datastructures import MultiDict
from baseframe import forms
@@ -63,7 +66,7 @@ class PublicEmailDomainFormTest(forms.Form):
@pytest.fixture
-def tforms(ctx):
+def tforms(ctx: AppContext) -> Generator[SimpleNamespace, None, None]:
urllib3.disable_warnings()
yield SimpleNamespace(
url_form=UrlFormTest(meta={'csrf': False}),
@@ -86,35 +89,35 @@ def test_is_empty() -> None:
assert forms.validators.is_empty(None) is True
-def test_valid_url(app, tforms) -> None:
+def test_valid_url(app: Flask, tforms: SimpleNamespace) -> None:
with app.test_request_context('/'):
url = 'https://hasgeek.com/'
tforms.url_form.process(url=url)
assert tforms.url_form.validate()
-def test_invalid_url(app, tforms) -> None:
+def test_invalid_url(app: Flask, tforms: SimpleNamespace) -> None:
with app.test_request_context('/'):
url = 'https://hasgeek'
tforms.url_form.process(url=url)
assert not tforms.url_form.validate()
-def test_valid_emoji(app, tforms) -> None:
+def test_valid_emoji(app: Flask, tforms: SimpleNamespace) -> None:
with app.test_request_context('/'):
dat = '👍'
tforms.emoji_form.process(emoji=dat)
assert tforms.emoji_form.validate() is True
-def test_invalid_emoji(app, tforms) -> None:
+def test_invalid_emoji(app: Flask, tforms: SimpleNamespace) -> None:
with app.test_request_context('/'):
dat = 'eviltext'
tforms.emoji_form.process(emoji=dat)
assert tforms.emoji_form.validate() is False
-def test_public_email_domain(app, tforms) -> None:
+def test_public_email_domain(app: Flask, tforms: SimpleNamespace) -> None:
with app.test_request_context('/'):
# both valid
tforms.webmail_form.process(
@@ -154,7 +157,7 @@ def test_public_email_domain(app, tforms) -> None:
assert 'not_webmail_domain' not in tforms.webmail_form.errors
-def test_public_email_domain_helper(app) -> None:
+def test_public_email_domain_helper(app: Flask) -> None:
with app.test_request_context('/'):
assert is_public_email_domain('gmail.com', default=False)
assert not is_public_email_domain('google.com', default=False)
@@ -179,21 +182,21 @@ def test_public_email_domain_helper(app) -> None:
)
-def test_url_without_protocol(app, tforms) -> None:
+def test_url_without_protocol(app: Flask, tforms: SimpleNamespace) -> None:
with app.test_request_context('/'):
url = 'hasgeek.com'
tforms.url_form.process(url=url)
assert not tforms.url_form.validate()
-def test_inaccessible_url(app, tforms) -> None:
+def test_inaccessible_url(app: Flask, tforms: SimpleNamespace) -> None:
with app.test_request_context('/'):
url = 'http://4dc1f6f0e7bc44f2b5b44f00abea4eae.com/'
tforms.url_form.process(url=url)
assert not tforms.url_form.validate()
-def test_disallowed_url(app, tforms) -> None:
+def test_disallowed_url(app: Flask, tforms: SimpleNamespace) -> None:
with app.test_request_context('/'):
url = 'https://example.com/'
tforms.url_form.process(url=url)
@@ -203,7 +206,7 @@ def test_disallowed_url(app, tforms) -> None:
assert not tforms.url_form.validate()
-def test_html_snippet_valid_urls(app, tforms) -> None:
+def test_html_snippet_valid_urls(app: Flask, tforms: SimpleNamespace) -> None:
url1 = 'https://hasgeek.com/'
url2 = 'https://hasjob.co/'
with app.test_request_context('/'):
@@ -217,7 +220,7 @@ def test_html_snippet_valid_urls(app, tforms) -> None:
assert tforms.all_urls_form.validate()
-def test_html_snippet_invalid_urls(app, tforms) -> None:
+def test_html_snippet_invalid_urls(app: Flask, tforms: SimpleNamespace) -> None:
url1 = 'https://hasgeek.com/'
url2 = 'https://hasjob'
with app.test_request_context('/'):
@@ -534,7 +537,7 @@ class TestFormBase:
form: forms.Form
@pytest.fixture(autouse=True)
- def _setup(self, app):
+ def _setup(self, app: Flask) -> Generator[None, None, None]:
with app.app_context():
self.form = self.Form(meta={'csrf': False})
yield
@@ -786,3 +789,98 @@ class Form(forms.Form):
other_empty = None # '' is not valid in IntegerField
other_not_empty = 0
+
+
+class TestValidCoordinates(TestFormBase):
+ class Form(forms.Form):
+ """Test form."""
+
+ coordinates = forms.CoordinatesField(
+ "Location",
+ validators=[forms.validators.ValidCoordinates()],
+ )
+
+ def test_none(self) -> None:
+ self.form.process(formdata=MultiDict({'coordinates': None}))
+ assert not self.form.validate()
+
+ def test_empty(self) -> None:
+ self.form.process(formdata=MultiDict({'coordinates': ()}))
+ assert not self.form.validate()
+
+ def test_nones(self) -> None:
+ self.form.process(formdata=MultiDict({'coordinates': (None, None)}))
+ assert not self.form.validate()
+
+ def test_blanks(self) -> None:
+ self.form.process(formdata=MultiDict({'coordinates': ('', '')}))
+ assert not self.form.validate()
+
+ def test_no_lat(self) -> None:
+ self.form.process(formdata=MultiDict({'coordinates': (None, 0)}))
+ assert not self.form.validate()
+
+ def test_no_lon(self) -> None:
+ self.form.process(formdata=MultiDict({'coordinates': (0, None)}))
+ assert not self.form.validate()
+
+ def test_invalid_lat(self) -> None:
+ self.form.process(formdata=MultiDict({'coordinates': (-100, 0)}))
+ assert not self.form.validate()
+
+ def test_invalid_lon(self) -> None:
+ self.form.process(formdata=MultiDict({'coordinates': (0, -200)}))
+ assert not self.form.validate()
+
+ def test_valid_latlon(self) -> None:
+ self.form.process(formdata=MultiDict({'coordinates': (13, 77.6)}))
+ assert self.form.validate()
+
+
+class TestOptionalCoordinates(TestFormBase):
+ class Form(forms.Form):
+ """Test form."""
+
+ coordinates = forms.CoordinatesField(
+ "Location",
+ validators=[
+ forms.validators.OptionalCoordinates(),
+ ],
+ )
+
+ def test_none(self) -> None:
+ self.form.process(formdata=MultiDict({'coordinates': None}))
+ assert self.form.validate()
+
+ def test_empty(self) -> None:
+ self.form.process(fromdata=MultiDict({'coordinates': ''}))
+ assert self.form.validate()
+
+ def test_nones(self) -> None:
+ self.form.process(formdata=MultiDict({'coordinates': (None, None)}))
+ self.form.validate()
+ assert self.form.errors == {}
+
+ def test_blanks(self) -> None:
+ self.form.process(formdata=MultiDict({'coordinates': ('', '')}))
+ assert self.form.validate()
+
+ def test_no_lat(self) -> None:
+ self.form.process(formdata=MultiDict({'coordinates': (None, 0)}))
+ assert not self.form.validate()
+
+ def test_no_lon(self) -> None:
+ self.form.process(formdata=MultiDict({'coordinates': (0, None)}))
+ assert not self.form.validate()
+
+ def test_invalid_lat(self) -> None:
+ self.form.process(formdata=MultiDict({'coordinates': (-100, 0)}))
+ assert not self.form.validate()
+
+ def test_invalid_lon(self) -> None:
+ self.form.process(formdata=MultiDict({'coordinates': (0, -200)}))
+ assert not self.form.validate()
+
+ def test_valid_latlon(self) -> None:
+ self.form.process(formdata=MultiDict({'coordinates': (13, 77.6)}))
+ assert self.form.validate()
diff --git a/tests/baseframe_tests/statsd_test.py b/tests/baseframe_tests/statsd_test.py
index 04886a9e..6e8bb561 100644
--- a/tests/baseframe_tests/statsd_test.py
+++ b/tests/baseframe_tests/statsd_test.py
@@ -4,11 +4,16 @@
# Tests adapted from https://github.com/bbelyeu/flask-statsdclient
+from __future__ import annotations
+
+from collections.abc import Callable
from datetime import timedelta
from unittest.mock import patch
import pytest
from flask import Flask, render_template_string
+from flask.ctx import AppContext
+from flask.typing import ResponseReturnValue
from flask_babel import Babel
from statsd.client.timer import Timer
from statsd.client.udp import Pipeline
@@ -18,29 +23,29 @@
@pytest.fixture
-def app():
+def app() -> Flask:
"""Redefine app without Baseframe for statsd tests."""
return Flask(__name__)
@pytest.fixture
-def statsd(app):
+def statsd(app: Flask) -> Statsd:
s = Statsd()
s.init_app(app)
return s
@pytest.fixture
-def view(app):
+def view(app: Flask) -> Callable[[], ResponseReturnValue]:
@app.route('/')
- def index():
+ def index() -> ResponseReturnValue:
return 'index'
return index
@pytest.fixture
-def form(app):
+def form(app: Flask) -> forms.Form:
Babel(app) # Needed for form validator message translations
class SimpleForm(forms.Form):
@@ -51,12 +56,12 @@ class SimpleForm(forms.Form):
return SimpleForm(meta={'csrf': False})
-def test_default_config(app, statsd) -> None:
+def test_default_config(app: Flask, statsd: Statsd) -> None:
# pylint: disable=protected-access
assert app.extensions['statsd_core']._addr == ('127.0.0.1', 8125)
-def test_custom_config(app) -> None:
+def test_custom_config(app: Flask) -> None:
# pylint: disable=protected-access
app.config['STATSD_HOST'] = '1.2.3.4'
app.config['STATSD_PORT'] = 12345
@@ -71,7 +76,7 @@ def test_custom_config(app) -> None:
# 3. Insert tags if tags are enabled and specified
-def test_incr(ctx, statsd) -> None:
+def test_incr(ctx: AppContext, statsd) -> None:
with patch('statsd.StatsClient.incr') as mock_incr:
statsd.incr('test.counter')
mock_incr.assert_called_once_with(
@@ -89,7 +94,7 @@ def test_incr(ctx, statsd) -> None:
)
-def test_decr(ctx, statsd) -> None:
+def test_decr(ctx: AppContext, statsd: Statsd) -> None:
with patch('statsd.StatsClient.decr') as mock_decr:
statsd.decr('test.counter')
mock_decr.assert_called_once_with(
@@ -107,7 +112,7 @@ def test_decr(ctx, statsd) -> None:
)
-def test_gauge(ctx, statsd) -> None:
+def test_gauge(ctx: AppContext, statsd: Statsd) -> None:
with patch('statsd.StatsClient.gauge') as mock_gauge:
statsd.gauge('test.gauge', 5)
mock_gauge.assert_called_once_with(
@@ -125,7 +130,7 @@ def test_gauge(ctx, statsd) -> None:
)
-def test_set(ctx, statsd) -> None:
+def test_set(ctx: AppContext, statsd: Statsd) -> None:
with patch('statsd.StatsClient.set') as mock_set:
statsd.set('test.set', 'item')
mock_set.assert_called_once_with(
@@ -138,7 +143,7 @@ def test_set(ctx, statsd) -> None:
)
-def test_timing(ctx, statsd) -> None:
+def test_timing(ctx: AppContext, statsd: Statsd) -> None:
with patch('statsd.StatsClient.timing') as mock_timing:
statsd.timing('test.timing', 10)
mock_timing.assert_called_once_with(
@@ -153,7 +158,7 @@ def test_timing(ctx, statsd) -> None:
)
-def test_timer(ctx, statsd) -> None:
+def test_timer(ctx: AppContext, statsd: Statsd) -> None:
timer = statsd.timer('test.timer', rate=1)
assert isinstance(timer, Timer)
assert timer.stat == 'flask_app.baseframe_tests.statsd_test.test.timer'
@@ -165,12 +170,12 @@ def test_timer(ctx, statsd) -> None:
assert timer.rate == 0.5
-def test_pipeline(ctx, statsd) -> None:
+def test_pipeline(ctx: AppContext, statsd: Statsd) -> None:
pipeline = statsd.pipeline()
assert isinstance(pipeline, Pipeline)
-def test_custom_rate(app, ctx, statsd) -> None:
+def test_custom_rate(app: Flask, ctx: AppContext, statsd: Statsd) -> None:
app.config['STATSD_RATE'] = 0.3
with patch('statsd.StatsClient.incr') as mock_incr:
statsd.incr('test.counter')
@@ -184,7 +189,7 @@ def test_custom_rate(app, ctx, statsd) -> None:
)
-def test_tags(app, ctx, statsd) -> None:
+def test_tags(app: Flask, ctx: AppContext, statsd: Statsd) -> None:
# Tags are converted into buckets if statsd doesn't support them
with patch('statsd.StatsClient.incr') as mock_incr:
statsd.incr('test.counter', tags={'tag': 'value'})
@@ -236,7 +241,9 @@ def test_tags(app, ctx, statsd) -> None:
)
-def test_request_handler_notags(app, statsd, view) -> None:
+def test_request_handler_notags(
+ app: Flask, statsd: Statsd, view: Callable[[], ResponseReturnValue]
+) -> None:
"""Test request_handlers logging with tags disabled."""
with (
patch('statsd.StatsClient.incr') as mock_incr,
@@ -261,7 +268,9 @@ def test_request_handler_notags(app, statsd, view) -> None:
mock_timing.assert_called()
-def test_request_handler_tags(app, statsd, view) -> None:
+def test_request_handler_tags(
+ app: Flask, statsd: Statsd, view: Callable[[], ResponseReturnValue]
+) -> None:
"""Test request_handlers logging with tags enabled."""
app.config['STATSD_TAGS'] = ','
with (
@@ -279,7 +288,9 @@ def test_request_handler_tags(app, statsd, view) -> None:
mock_timing.assert_called_once()
-def test_request_handler_disabled(app, view) -> None:
+def test_request_handler_disabled(
+ app: Flask, view: Callable[[], ResponseReturnValue]
+) -> None:
"""Test request_handlers logging disabled."""
app.config['STATSD_REQUEST_LOG'] = False
Statsd(app)
@@ -293,7 +304,7 @@ def test_request_handler_disabled(app, view) -> None:
mock_timing.assert_not_called()
-def test_render_template_notags(app, statsd) -> None:
+def test_render_template_notags(app: Flask, statsd: Statsd) -> None:
"""Test render_template logging with tags disabled."""
with (
patch('statsd.StatsClient.incr') as mock_incr,
@@ -305,17 +316,15 @@ def test_render_template_notags(app, statsd) -> None:
assert mock_timing.call_count == 2
assert [c[0][0] for c in mock_incr.call_args_list] == [
'flask_app.baseframe_tests.statsd_test.render_template.template__str',
- 'flask_app.baseframe_tests.statsd_test.render_template'
- '.template__overall',
+ 'flask_app.baseframe_tests.statsd_test.render_template.template__overall',
]
assert [c[0][0] for c in mock_incr.call_args_list] == [
'flask_app.baseframe_tests.statsd_test.render_template.template__str',
- 'flask_app.baseframe_tests.statsd_test.render_template'
- '.template__overall',
+ 'flask_app.baseframe_tests.statsd_test.render_template.template__overall',
]
-def test_render_template_tags(app, statsd) -> None:
+def test_render_template_tags(app: Flask, statsd: Statsd) -> None:
"""Test render_template logging with tags enabled."""
app.config['STATSD_TAGS'] = ','
with (
@@ -336,7 +345,9 @@ def test_render_template_tags(app, statsd) -> None:
)
-def test_render_template_disabled(app, view) -> None:
+def test_render_template_disabled(
+ app: Flask, view: Callable[[], ResponseReturnValue]
+) -> None:
"""Test render_template logging disabled."""
app.config['STATSD_RENDERTEMPLATE_LOG'] = False
Statsd(app)
@@ -350,7 +361,9 @@ def test_render_template_disabled(app, view) -> None:
mock_timing.assert_not_called()
-def test_form_success(ctx, app, statsd, form) -> None:
+def test_form_success(
+ ctx: AppContext, app: Flask, statsd: Statsd, form: forms.Form
+) -> None:
app.config['STATSD_TAGS'] = ','
with patch('statsd.StatsClient.incr') as mock_incr:
form.field.data = "test"
@@ -363,7 +376,7 @@ def test_form_success(ctx, app, statsd, form) -> None:
)
-def test_form_error(ctx, app, statsd, form) -> None:
+def test_form_error(ctx, app: Flask, statsd: Statsd, form: forms.Form) -> None:
app.config['STATSD_TAGS'] = ','
with patch('statsd.StatsClient.incr') as mock_incr:
form.field.data = None
@@ -376,7 +389,9 @@ def test_form_error(ctx, app, statsd, form) -> None:
)
-def test_form_nolog(ctx, app, statsd, form) -> None:
+def test_form_nolog(
+ ctx: AppContext, app: Flask, statsd: Statsd, form: forms.Form
+) -> None:
app.config['STATSD_TAGS'] = ','
app.config['STATSD_FORM_LOG'] = False
with patch('statsd.StatsClient.incr') as mock_incr:
@@ -388,7 +403,9 @@ def test_form_nolog(ctx, app, statsd, form) -> None:
mock_incr.assert_not_called()
-def test_form_signals_off(ctx, app, statsd, form) -> None:
+def test_form_signals_off(
+ ctx: AppContext, app: Flask, statsd: Statsd, form: forms.Form
+) -> None:
app.config['STATSD_TAGS'] = ','
app.config['STATSD_FORM_LOG'] = True
with patch('statsd.StatsClient.incr') as mock_incr:
diff --git a/tests/baseframe_tests/utils_test.py b/tests/baseframe_tests/utils_test.py
index 252bb994..6978b296 100644
--- a/tests/baseframe_tests/utils_test.py
+++ b/tests/baseframe_tests/utils_test.py
@@ -1,8 +1,10 @@
"""Test utils."""
-
# pylint: disable=redefined-outer-name
+from collections.abc import Callable
+
import pytest
+from flask import Flask
from baseframe.utils import (
_localized_country_list_inner,
@@ -15,11 +17,11 @@
@pytest.fixture
-def testview(app):
+def testview(app: Flask) -> Callable[[], str]:
"""Add a view to the app for testing."""
@app.route('/localetest')
- def locale_testview():
+ def locale_testview() -> str:
country_list = localized_country_list()
return dict(country_list)['DE']