Skip to content

Commit

Permalink
Merge branch 'sign-it'
Browse files Browse the repository at this point in the history
  • Loading branch information
pmario committed Aug 27, 2019
2 parents 56f2cff + 7695944 commit 1b63a9f
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 13 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ So the implemented sequence is:
Which will result in a slightly better recovery coverage.

## Links

[1] [https://tiddlywiki.com/#GettingStarted](https://tiddlywiki.com/#GettingStarted)
[1] [https://tiddlywiki.com/#GettingStarted](https://tiddlywiki.com/#GettingStarted)
[2] [Overview Releases](https://github.com/pmario/file-backups/releases/)

## License

Copyright Mario Pietsch 2017
Copyright Mario Pietsch 2017-2019

CC-BY-NC-SA ... [https://creativecommons.org/licenses/by-nc-sa/4.0](https://creativecommons.org/licenses/by-nc-sa/4.0)

5 changes: 4 additions & 1 deletion addon/classic/inject.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,12 @@ Returns text if successful, false if failed, null if not available
*/
var injectedLoadFile = function(path) {
try {
// fix a problem introduced with FF 68 and
// path differences between WinOS and *nix OSes
path = (path.charAt(0) !== "/") ? "/" + path : path;
// Just read the file synchronously
var xhReq = new XMLHttpRequest();
xhReq.open("GET", "file:///" + escape(path), false);
xhReq.open("GET", "file://" + escape(path), false);
xhReq.send(null);
return xhReq.responseText;
} catch(ex) {
Expand Down
2 changes: 1 addition & 1 deletion addon/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifest_version": 2,
"name": "File Backups - For TiddlyWiki",
"version": "0.3.8",
"version": "0.3.10",
"description": "TiddlyWiki saving and backup, using a Tower of Hanoi strategy!",
"icons": {
"32": "icons/diamond-32.png",
Expand Down
5 changes: 4 additions & 1 deletion assets/classic/inject.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,12 @@ Returns text if successful, false if failed, null if not available
*/
var injectedLoadFile = function(path) {
try {
// fix a problem introduced with FF 68 and
// path differences between WinOS and *nix OSes
path = (path.charAt(0) !== "/") ? "/" + path : path;
// Just read the file synchronously
var xhReq = new XMLHttpRequest();
xhReq.open("GET", "file:///" + escape(path), false);
xhReq.open("GET", "file://" + escape(path), false);
xhReq.send(null);
return xhReq.responseText;
} catch(ex) {
Expand Down
2 changes: 1 addition & 1 deletion assets/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"manifest_version": 2,
"name": "File Backups - For TiddlyWiki",
"version": "0.3.8",
"version": "0.3.10",
"description": "TiddlyWiki saving and backup, using a Tower of Hanoi strategy!",
"icons": {
"32": "icons/diamond-32.png",
Expand Down
8 changes: 6 additions & 2 deletions build-tools/sign-addon.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ addon_dir="addon"
output_dir="$addon_dir/web-ext-artifacts"
gh_pages="docs"

# inside this git repo we'll pretend to be a new user
git config user.name "pmario"
git config user.email "pmariojo@gmail.com"

# clear and re-create the out directory
rm -rf $output_dir || exit 0;
#mkdir $output_dir; # web-ext creates it on the fly.
Expand All @@ -24,8 +28,8 @@ cp $output_dir/*.xpi $gh_pages
cp README.md $gh_pages

# inside this git repo we'll pretend to be a new user
git config user.name "pmario"
git config user.email "pmariojo@gmail.com"
#git config user.name "pmario"
#git config user.email "pmariojo@gmail.com"

git checkout -b addon-signed

Expand Down
6 changes: 3 additions & 3 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ So the implemented sequence is:
Which will result in a slightly better recovery coverage.

## Links

[1] [https://tiddlywiki.com/#GettingStarted](https://tiddlywiki.com/#GettingStarted)
[1] [https://tiddlywiki.com/#GettingStarted](https://tiddlywiki.com/#GettingStarted)
[2] [Overview Releases](https://github.com/pmario/file-backups/releases/)

## License

Copyright Mario Pietsch 2017
Copyright Mario Pietsch 2017-2019

CC-BY-NC-SA ... [https://creativecommons.org/licenses/by-nc-sa/4.0](https://creativecommons.org/licenses/by-nc-sa/4.0)

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "file-backups",
"version": "0.3.9",
"version": "0.3.10",
"description": "This browser add on is designed to let you easily save and backup TiddlyWikis.",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
Expand Down

0 comments on commit 1b63a9f

Please sign in to comment.