diff --git a/bower.json b/bower.json index 1ef53ea2..6cef1c34 100644 --- a/bower.json +++ b/bower.json @@ -19,7 +19,7 @@ "requirejs-text": "~2.0.10", "bootstrap-tour": "~0.6.0", "ace": "4bbe5346f2ae5ad35c0c47defa244ab27aedd451", - "pagedown-ace": "git@github.com:benweet/pagedown-ace.git#7805f240f343b5b2a05a5b9c0d4a3f5091e7a49b", + "pagedown-ace": "https://github.com/benweet/pagedown-ace.git#72a27932f6f4f78e93a186aa2947d1f15c1cd7d5", "pagedown-extra": "git@github.com:jmcmanus/pagedown-extra.git#ae1547d1662e07d6530137bd3dff3a6e6c8aec3b", "crel": "git@github.com:KoryNunn/crel.git#8dbda04b129fc0aec01a2a080d1cab26816e11c1", "waitForImages": "git@github.com:alexanderdickson/waitForImages.git#~1.4.2", @@ -30,6 +30,7 @@ "lz-string": "git@github.com:pieroxy/lz-string.git" }, "resolutions": { - "jquery": "2.0.3" + "jquery": "2.0.3", + "pagedown-ace": "252130af110132fd5e36f66e5e91a55ca2a9584d" } } diff --git a/public/cache.manifest b/public/cache.manifest index 4149061c..0c708148 100644 --- a/public/cache.manifest +++ b/public/cache.manifest @@ -1,5 +1,5 @@ CACHE MANIFEST -#Date Sat Nov 16 2013 18:10:31 +#Date Tue Nov 19 2013 00:39:24 CACHE: res/worker.js @@ -34,6 +34,7 @@ res-min/themes/blue-gray.css res-min/themes/default.css res-min/themes/night.css res-min/themes/school.css +libs/dictionaries/.DS_Store libs/dictionaries/de_DE.aff.lz libs/dictionaries/de_DE.dic.lz libs/dictionaries/en_US.aff.lz diff --git a/public/res-min/main.js b/public/res-min/main.js index 63246969..1b8a0fcf 100644 --- a/public/res-min/main.js +++ b/public/res-min/main.js @@ -307,6 +307,20 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +// Copyright (C) 2006 Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + /* * to-markdown - an HTML to Markdown converter * @@ -455,20 +469,6 @@ THE SOFTWARE. * - Namespaced all events */ -// Copyright (C) 2006 Google Inc. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - /** * bootstrap.js v3.0.0 by @fat and @mdo * Copyright 2013 Twitter Inc. @@ -1004,38 +1004,38 @@ function printStackTrace(e) { function w(t) { return e.getComputedStyle(t, null); } - function C(e, t) { + function x(e, t) { for (var n, i, o, r = [], s = 0, a = e.length; a > s; s++) i = e[s], i.style && (r[s] = mt.get(i, "olddisplay"), - n = i.style.display, t ? (r[s] || "none" !== n || (i.style.display = ""), "" === i.style.display && y(i) && (r[s] = mt.access(i, "olddisplay", A(i.nodeName)))) : r[s] || (o = y(i), + n = i.style.display, t ? (r[s] || "none" !== n || (i.style.display = ""), "" === i.style.display && y(i) && (r[s] = mt.access(i, "olddisplay", S(i.nodeName)))) : r[s] || (o = y(i), (n && "none" !== n || !o) && mt.set(i, "olddisplay", o ? n : rt.css(i, "display")))); for (s = 0; a > s; s++) i = e[s], i.style && (t && "none" !== i.style.display && "" !== i.style.display || (i.style.display = t ? r[s] || "" : "none")); return e; } - function x(e, t, n) { + function C(e, t, n) { var i = Gt.exec(t); return i ? Math.max(0, i[1] - (n || 0)) + (i[2] || "px") : t; } - function E(e, t, n, i, o) { + function k(e, t, n, i, o) { for (var r = n === (i ? "border" : "content") ? 4 : "width" === t ? 1 : 0, s = 0; 4 > r; r += 2) "margin" === n && (s += rt.css(e, n + Jt[r], !0, o)), i ? ("content" === n && (s -= rt.css(e, "padding" + Jt[r], !0, o)), "margin" !== n && (s -= rt.css(e, "border" + Jt[r] + "Width", !0, o))) : (s += rt.css(e, "padding" + Jt[r], !0, o), "padding" !== n && (s += rt.css(e, "border" + Jt[r] + "Width", !0, o))); return s; } - function S(e, t, n) { + function E(e, t, n) { var i = !0, o = "width" === t ? e.offsetWidth : e.offsetHeight, r = w(e), s = rt.support.boxSizing && "border-box" === rt.css(e, "boxSizing", !1, r); if (0 >= o || null == o) { if (o = Ht(e, t, r), (0 > o || null == o) && (o = e.style[t]), Vt.test(o)) return o; i = s && (rt.support.boxSizingReliable || o === e.style[t]), o = parseFloat(o) || 0; } - return o + E(e, t, n || (s ? "border" : "content"), i, r) + "px"; + return o + k(e, t, n || (s ? "border" : "content"), i, r) + "px"; } - function A(e) { + function S(e) { var t = U, n = Xt[e]; - return n || (n = k(e, t), "none" !== n && n || (Wt = (Wt || rt("