Skip to content
Snippets Groups Projects
Commit fb9a7f6f authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'sc' into 'pregmod-master'

Update SC to v2.35.0

See merge request pregmodfan/fc-pregmod!9110
parents c97fc442 f248dd2c
No related branches found
No related tags found
1 merge request!9110Update SC to v2.35.0
Pipeline #23613 passed
......@@ -55,7 +55,7 @@ index 4d90705..79058a1 100644
'src/lib/simplestore/adapters/cookie.js',
'src/lib/debugview.js',
diff --git a/src/lib/helpers.js b/src/lib/helpers.js
index 3c37ad9..42b1c39 100644
index 25682ee..a1f5600 100644
--- a/src/lib/helpers.js
+++ b/src/lib/helpers.js
@@ -289,7 +289,7 @@ var { // eslint-disable-line no-var
......@@ -97,7 +97,7 @@ index 3c37ad9..42b1c39 100644
.addClass('error-view')
.appendTo(place);
diff --git a/src/lib/jquery-plugins.js b/src/lib/jquery-plugins.js
index 792b01f..1811eaf 100644
index 225ed5c..21b3159 100644
--- a/src/lib/jquery-plugins.js
+++ b/src/lib/jquery-plugins.js
@@ -43,14 +43,9 @@
......@@ -308,7 +308,7 @@ index 0000000..34581b1
+ }));
+})());
diff --git a/src/lib/simplestore/adapters/webstorage.js b/src/lib/simplestore/adapters/webstorage.js
index 75408a3..3993e1e 100644
index 27d3801..4c689bc 100644
--- a/src/lib/simplestore/adapters/webstorage.js
+++ b/src/lib/simplestore/adapters/webstorage.js
@@ -125,7 +125,7 @@ SimpleStore.adapters.push((() => {
......@@ -350,7 +350,7 @@ index 75408a3..3993e1e 100644
}
diff --git a/src/macros/macrocontext.js b/src/macros/macrocontext.js
index bd211cd..712e9e1 100644
index df25bb4..9272ede 100644
--- a/src/macros/macrocontext.js
+++ b/src/macros/macrocontext.js
@@ -277,8 +277,8 @@ var MacroContext = (() => { // eslint-disable-line no-unused-vars, no-var
......@@ -365,7 +365,7 @@ index bd211cd..712e9e1 100644
}
diff --git a/src/macros/macrolib.js b/src/macros/macrolib.js
index 6ca8832..9b85be0 100644
index a5df9ef..aca46da 100644
--- a/src/macros/macrolib.js
+++ b/src/macros/macrolib.js
@@ -90,7 +90,7 @@
......@@ -396,7 +396,7 @@ index 6ca8832..9b85be0 100644
}
});
diff --git a/src/markup/wikifier.js b/src/markup/wikifier.js
index bc8b018..df7285c 100644
index 2f3b07d..eaeac6b 100644
--- a/src/markup/wikifier.js
+++ b/src/markup/wikifier.js
@@ -222,7 +222,7 @@ var Wikifier = (() => { // eslint-disable-line no-unused-vars, no-var
......@@ -409,7 +409,7 @@ index bc8b018..df7285c 100644
/*
diff --git a/src/passage.js b/src/passage.js
index e02078a..7e4e2be 100644
index ad30823..5b26b0b 100644
--- a/src/passage.js
+++ b/src/passage.js
@@ -214,8 +214,10 @@ var Passage = (() => { // eslint-disable-line no-unused-vars, no-var
......@@ -426,7 +426,7 @@ index e02078a..7e4e2be 100644
return frag;
}
diff --git a/src/save.js b/src/save.js
index b6cca52..adbf7f1 100644
index a4931bf..f9cb6bc 100644
--- a/src/save.js
+++ b/src/save.js
@@ -38,12 +38,66 @@ var Save = (() => { // eslint-disable-line no-unused-vars, no-var
......@@ -874,7 +874,7 @@ index b6cca52..adbf7f1 100644
/*
Autosave Functions.
diff --git a/src/state.js b/src/state.js
index 96b6e3e..fcc0cfb 100644
index 7759009..f9dfaf0 100644
--- a/src/state.js
+++ b/src/state.js
@@ -104,7 +104,7 @@ var State = (() => { // eslint-disable-line no-unused-vars, no-var
......@@ -898,7 +898,7 @@ index 96b6e3e..fcc0cfb 100644
}
diff --git a/src/ui.js b/src/ui.js
index 9115391..0e06d78 100644
index bc62bf5..ca312f2 100644
--- a/src/ui.js
+++ b/src/ui.js
@@ -254,7 +254,7 @@ var UI = (() => { // eslint-disable-line no-unused-vars, no-var
......
Copyright (c) 2013-2019, Thomas Michael Edwards <thomasmedwards@gmail.com>.
Copyright (c) 2013-2021, Thomas Michael Edwards <thomasmedwards@gmail.com>.
All rights reserved.
Redistribution and use in source and binary forms, with or without
......
Source diff could not be displayed: it is too large. Options to address this: view the blob.
Subproject commit 8464936f0524c87f5e41960359de37aa5c34040f
Subproject commit 807cb7cd56ba0639425e44fc4cacdf2d5fc542da
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment