diff --git a/bower.json b/bower.json index ac511ad7..93599343 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "stackedit", - "version": "4.3.18", + "version": "4.3.19", "description": "StackEdit is a free, open-source Markdown editor based on PageDown, the Markdown library used by Stack Overflow and the other Stack Exchange sites.", "dependencies": { "bootstrap": "3.0.3", diff --git a/package.json b/package.json index 7f14ecec..2263f195 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "stackedit", - "version": "4.3.18", + "version": "4.3.19", "description": "StackEdit is a free, open-source Markdown editor based on PageDown, the Markdown library used by Stack Overflow and the other Stack Exchange sites.", "main": "res/main.js", "engines": { diff --git a/public/cache.manifest b/public/cache.manifest index 91fd976c..5d03d78b 100644 --- a/public/cache.manifest +++ b/public/cache.manifest @@ -1,5 +1,5 @@ CACHE MANIFEST -#Date Fri Sep 29 2017 20:16:40 GMT+0100 (WEST) +#Date Sun Jan 07 2018 16:23:22 GMT+0000 (WET) CACHE: . @@ -24,14 +24,6 @@ res-min/font/SourceSansPro-Regular-webfont.woff res-min/font/cursive_standard-webfont.woff res-min/font/fontello.svg res-min/font/fontello.woff -res-min/themes/base.css -res-min/themes/blue.css -res-min/themes/default.css -res-min/themes/gray.css -res-min/themes/night.css -res-min/themes/school.css -res-min/themes/solarized-dark.css -res-min/themes/solarized-light.css res-min/img/button.svg res-min/img/code-block.png res-min/img/comments.png @@ -51,6 +43,14 @@ res-min/img/publish.png res-min/img/stackedit-32.ico res-min/img/syntax-highlighting.gif res-min/img/toc.gif +res-min/themes/base.css +res-min/themes/blue.css +res-min/themes/default.css +res-min/themes/gray.css +res-min/themes/night.css +res-min/themes/school.css +res-min/themes/solarized-dark.css +res-min/themes/solarized-light.css # end_inject_resources @@ -148,16 +148,6 @@ res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/MiscTechnical.js?rev res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/PUA.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/SpacingModLetters.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/SuppMathOperators.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Caligraphic/Bold/Main.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Caligraphic/Regular/Main.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Bold/BasicLatin.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Bold/Main.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Bold/Other.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Bold/PUA.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Regular/BasicLatin.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Regular/Main.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Regular/Other.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Regular/PUA.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/Arrows.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/BasicLatin.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/CombDiacritMarks.js?rev=2.6.1 @@ -177,15 +167,21 @@ res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/MiscTechnical.js?rev=2 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/SpacingModLetters.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/SuppMathOperators.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Bold/SupplementalArrowsA.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/BasicLatin.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/CombDiacritMarks.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/GeneralPunctuation.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/GreekAndCoptic.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/LatinExtendedA.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/LatinExtendedB.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/LetterlikeSymbols.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/Main.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/MathOperators.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Bold/BasicLatin.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Bold/Main.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Bold/Other.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Bold/PUA.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Regular/BasicLatin.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Regular/Main.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Regular/Other.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Fraktur/Regular/PUA.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Caligraphic/Bold/Main.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Caligraphic/Regular/Main.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Math/BoldItalic/Main.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Bold/BasicLatin.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Bold/CombDiacritMarks.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Bold/Main.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Bold/Other.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/BasicLatin.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/CombDiacritMarks.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/GeometricShapes.js?rev=2.6.1 @@ -198,26 +194,30 @@ res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/MathOperators.js?re res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/MiscSymbols.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/SpacingModLetters.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Regular/SuppMathOperators.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Math/Italic/Main.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Math/BoldItalic/Main.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Bold/BasicLatin.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Bold/CombDiacritMarks.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Bold/Main.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Bold/Other.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Italic/BasicLatin.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Italic/CombDiacritMarks.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Italic/Main.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Italic/Other.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/BasicLatin.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/CombDiacritMarks.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/GeneralPunctuation.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/GreekAndCoptic.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/LatinExtendedA.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/LatinExtendedB.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/LetterlikeSymbols.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/Main.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Main/Italic/MathOperators.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Math/Italic/Main.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Regular/BasicLatin.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Regular/CombDiacritMarks.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Regular/Main.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/SansSerif/Regular/Other.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Size3/Regular/Main.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Size1/Regular/Main.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Script/Regular/BasicLatin.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Script/Regular/Main.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Size1/Regular/Main.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Size3/Regular/Main.js?rev=2.6.1 -res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Size2/Regular/Main.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Size4/Regular/Main.js?rev=2.6.1 +res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Size2/Regular/Main.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Typewriter/Regular/BasicLatin.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Typewriter/Regular/CombDiacritMarks.js?rev=2.6.1 res/bower-libs/MathJax/jax/output/SVG/fonts/TeX/Typewriter/Regular/Main.js?rev=2.6.1 diff --git a/public/res-min/main.js b/public/res-min/main.js index 64ccfe94..040ca46a 100644 --- a/public/res-min/main.js +++ b/public/res-min/main.js @@ -3,16 +3,16 @@ function diff_match_patch() { this.Patch_DeleteThreshold = .5, this.Patch_Margin = 4, this.Match_MaxBits = 32; } -!function(e, t) { - function n(e) { - var t = e.length, n = rt.type(e); - return !rt.isWindow(e) && (!(1 !== e.nodeType || !t) || "array" === n || "function" !== n && (0 === t || "number" == typeof t && t > 0 && t - 1 in e)); +!function(t, e) { + function n(t) { + var e = t.length, n = rt.type(t); + return !rt.isWindow(t) && (!(1 !== t.nodeType || !e) || "array" === n || "function" !== n && (0 === e || "number" == typeof e && e > 0 && e - 1 in t)); } - function i(e) { - var t = ht[e] = {}; - return rt.each(e.match(at) || [], function(e, n) { - t[n] = !0; - }), t; + function i(t) { + var e = ht[t] = {}; + return rt.each(t.match(at) || [], function(t, n) { + e[n] = !0; + }), e; } function r() { Object.defineProperty(this.cache = {}, 0, { @@ -21,15 +21,15 @@ function diff_match_patch() { } }), this.expando = rt.expando + Math.random(); } - function o(e, n, i) { + function o(t, n, i) { var r; - if (i === t && 1 === e.nodeType) if (r = "data-" + n.replace(vt, "-$1").toLowerCase(), - "string" == typeof (i = e.getAttribute(r))) { + if (i === e && 1 === t.nodeType) if (r = "data-" + n.replace(vt, "-$1").toLowerCase(), + "string" == typeof (i = t.getAttribute(r))) { try { i = "true" === i || "false" !== i && ("null" === i ? null : +i + "" === i ? +i : gt.test(i) ? JSON.parse(i) : i); - } catch (e) {} - ft.set(e, n, i); - } else i = t; + } catch (t) {} + ft.set(t, n, i); + } else i = e; return i; } function a() { @@ -41,145 +41,145 @@ function diff_match_patch() { function l() { try { return z.activeElement; - } catch (e) {} + } catch (t) {} } - function c(e, t) { - for (;(e = e[t]) && 1 !== e.nodeType; ) ; - return e; + function c(t, e) { + for (;(t = t[e]) && 1 !== t.nodeType; ) ; + return t; } - function u(e, t, n) { - if (rt.isFunction(t)) return rt.grep(e, function(e, i) { - return !!t.call(e, i, e) !== n; + function u(t, e, n) { + if (rt.isFunction(e)) return rt.grep(t, function(t, i) { + return !!e.call(t, i, t) !== n; }); - if (t.nodeType) return rt.grep(e, function(e) { - return e === t !== n; + if (e.nodeType) return rt.grep(t, function(t) { + return t === e !== n; }); - if ("string" == typeof t) { - if (Et.test(t)) return rt.filter(t, e, n); - t = rt.filter(t, e); + if ("string" == typeof e) { + if (Et.test(e)) return rt.filter(e, t, n); + e = rt.filter(e, t); } - return rt.grep(e, function(e) { - return et.call(t, e) >= 0 !== n; + return rt.grep(t, function(t) { + return tt.call(e, t) >= 0 !== n; }); } - function d(e, t) { - return rt.nodeName(e, "table") && rt.nodeName(1 === t.nodeType ? t : t.firstChild, "tr") ? e.getElementsByTagName("tbody")[0] || e.appendChild(e.ownerDocument.createElement("tbody")) : e; + function d(t, e) { + return rt.nodeName(t, "table") && rt.nodeName(1 === e.nodeType ? e : e.firstChild, "tr") ? t.getElementsByTagName("tbody")[0] || t.appendChild(t.ownerDocument.createElement("tbody")) : t; } - function p(e) { - return e.type = (null !== e.getAttribute("type")) + "/" + e.type, e; + function p(t) { + return t.type = (null !== t.getAttribute("type")) + "/" + t.type, t; } - function h(e) { - var t = Ft.exec(e.type); - return t ? e.type = t[1] : e.removeAttribute("type"), e; + function h(t) { + var e = Ft.exec(t.type); + return e ? t.type = e[1] : t.removeAttribute("type"), t; } - function f(e, t) { - for (var n = e.length, i = 0; n > i; i++) mt.set(e[i], "globalEval", !t || mt.get(t[i], "globalEval")); + function f(t, e) { + for (var n = t.length, i = 0; i < n; i++) mt.set(t[i], "globalEval", !e || mt.get(e[i], "globalEval")); } - function m(e, t) { + function m(t, e) { var n, i, r, o, a, s, l, c; - if (1 === t.nodeType) { - if (mt.hasData(e) && (o = mt.access(e), a = mt.set(t, o), c = o.events)) { + if (1 === e.nodeType) { + if (mt.hasData(t) && (o = mt.access(t), a = mt.set(e, o), c = o.events)) { delete a.handle, a.events = {}; - for (r in c) for (n = 0, i = c[r].length; i > n; n++) rt.event.add(t, r, c[r][n]); + for (r in c) for (n = 0, i = c[r].length; n < i; n++) rt.event.add(e, r, c[r][n]); } - ft.hasData(e) && (s = ft.access(e), l = rt.extend({}, s), ft.set(t, l)); + ft.hasData(t) && (s = ft.access(t), l = rt.extend({}, s), ft.set(e, l)); } } - function g(e, n) { - var i = e.getElementsByTagName ? e.getElementsByTagName(n || "*") : e.querySelectorAll ? e.querySelectorAll(n || "*") : []; - return n === t || n && rt.nodeName(e, n) ? rt.merge([ e ], i) : i; + function g(t, n) { + var i = t.getElementsByTagName ? t.getElementsByTagName(n || "*") : t.querySelectorAll ? t.querySelectorAll(n || "*") : []; + return n === e || n && rt.nodeName(t, n) ? rt.merge([ t ], i) : i; } - function v(e, t) { - var n = t.nodeName.toLowerCase(); - "input" === n && Rt.test(e.type) ? t.checked = e.checked : "input" !== n && "textarea" !== n || (t.defaultValue = e.defaultValue); + function v(t, e) { + var n = e.nodeName.toLowerCase(); + "input" === n && Rt.test(t.type) ? e.checked = t.checked : "input" !== n && "textarea" !== n || (e.defaultValue = t.defaultValue); } - function b(e, t) { - if (t in e) return t; - for (var n = t.charAt(0).toUpperCase() + t.slice(1), i = t, r = Kt.length; r--; ) if ((t = Kt[r] + n) in e) return t; + function b(t, e) { + if (e in t) return e; + for (var n = e.charAt(0).toUpperCase() + e.slice(1), i = e, r = Kt.length; r--; ) if ((e = Kt[r] + n) in t) return e; return i; } - function y(e, t) { - return e = t || e, "none" === rt.css(e, "display") || !rt.contains(e.ownerDocument, e); + function y(t, e) { + return t = e || t, "none" === rt.css(t, "display") || !rt.contains(t.ownerDocument, t); } - function x(t) { - return e.getComputedStyle(t, null); + function x(e) { + return t.getComputedStyle(e, null); } - function w(e, t) { - for (var n, i, r, o = [], a = 0, s = e.length; s > a; a++) i = e[a], i.style && (o[a] = mt.get(i, "olddisplay"), - n = i.style.display, t ? (o[a] || "none" !== n || (i.style.display = ""), "" === i.style.display && y(i) && (o[a] = mt.access(i, "olddisplay", k(i.nodeName)))) : o[a] || (r = y(i), + function w(t, e) { + for (var n, i, r, o = [], a = 0, s = t.length; a < s; a++) i = t[a], i.style && (o[a] = mt.get(i, "olddisplay"), + n = i.style.display, e ? (o[a] || "none" !== n || (i.style.display = ""), "" === i.style.display && y(i) && (o[a] = mt.access(i, "olddisplay", k(i.nodeName)))) : o[a] || (r = y(i), (n && "none" !== n || !r) && mt.set(i, "olddisplay", r ? n : rt.css(i, "display")))); - for (a = 0; s > a; a++) i = e[a], i.style && (t && "none" !== i.style.display && "" !== i.style.display || (i.style.display = t ? o[a] || "" : "none")); - return e; + for (a = 0; a < s; a++) i = t[a], i.style && (e && "none" !== i.style.display && "" !== i.style.display || (i.style.display = e ? o[a] || "" : "none")); + return t; } - function S(e, t, n) { - var i = Ut.exec(t); - return i ? Math.max(0, i[1] - (n || 0)) + (i[2] || "px") : t; + function S(t, e, n) { + var i = Ut.exec(e); + return i ? Math.max(0, i[1] - (n || 0)) + (i[2] || "px") : e; } - function C(e, t, n, i, r) { - for (var o = n === (i ? "border" : "content") ? 4 : "width" === t ? 1 : 0, a = 0; 4 > o; o += 2) "margin" === n && (a += rt.css(e, n + Yt[o], !0, r)), - i ? ("content" === n && (a -= rt.css(e, "padding" + Yt[o], !0, r)), "margin" !== n && (a -= rt.css(e, "border" + Yt[o] + "Width", !0, r))) : (a += rt.css(e, "padding" + Yt[o], !0, r), - "padding" !== n && (a += rt.css(e, "border" + Yt[o] + "Width", !0, r))); + function C(t, e, n, i, r) { + for (var o = n === (i ? "border" : "content") ? 4 : "width" === e ? 1 : 0, a = 0; o < 4; o += 2) "margin" === n && (a += rt.css(t, n + Yt[o], !0, r)), + i ? ("content" === n && (a -= rt.css(t, "padding" + Yt[o], !0, r)), "margin" !== n && (a -= rt.css(t, "border" + Yt[o] + "Width", !0, r))) : (a += rt.css(t, "padding" + Yt[o], !0, r), + "padding" !== n && (a += rt.css(t, "border" + Yt[o] + "Width", !0, r))); return a; } - function _(e, t, n) { - var i = !0, r = "width" === t ? e.offsetWidth : e.offsetHeight, o = x(e), a = rt.support.boxSizing && "border-box" === rt.css(e, "boxSizing", !1, o); - if (0 >= r || null == r) { - if (r = $t(e, t, o), (0 > r || null == r) && (r = e.style[t]), zt.test(r)) return r; - i = a && (rt.support.boxSizingReliable || r === e.style[t]), r = parseFloat(r) || 0; + function _(t, e, n) { + var i = !0, r = "width" === e ? t.offsetWidth : t.offsetHeight, o = x(t), a = rt.support.boxSizing && "border-box" === rt.css(t, "boxSizing", !1, o); + if (r <= 0 || null == r) { + if (r = $t(t, e, o), (r < 0 || null == r) && (r = t.style[e]), zt.test(r)) return r; + i = a && (rt.support.boxSizingReliable || r === t.style[e]), r = parseFloat(r) || 0; } - return r + C(e, t, n || (a ? "border" : "content"), i, o) + "px"; + return r + C(t, e, n || (a ? "border" : "content"), i, o) + "px"; } - function k(e) { - var t = z, n = Wt[e]; - return n || (n = E(e, t), "none" !== n && n || (Gt = (Gt || rt("