Skip to content
This repository has been archived by the owner on Apr 25, 2022. It is now read-only.

Commit

Permalink
fixed #4
Browse files Browse the repository at this point in the history
  • Loading branch information
kimbtech committed Jan 13, 2019
1 parent 4f3f83f commit a3c5669
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.json.lock
2 changes: 1 addition & 1 deletion system/load/backend.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion system/load/devjs/fun_maker.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ function maker(noteid, notename, sharecont, savecallback) {
}
else{
//Offline nicht verfügbar
confirmDialog('Die gewäöhlte Notiz ist auf diesem Gerät leider nicht offline verfügbar!',
confirmDialog('Die gewählte Notiz ist auf diesem Gerät leider nicht offline verfügbar!',
{ "OK" : function (){$(this).dialog("close");} },
'Offlinemodus'
);
Expand Down
15 changes: 15 additions & 0 deletions system/load/devjs/globals.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ function ajax_request( task, post, callback, errcallback ){
console.log( data.error );
}
else{
if( systemOfflineMode ){
//remove force reconnect if clicked on errormsg
$("div.global.error.message").unbind('click');
}
//hier online
systemOfflineMode = false;
systemOfflineManager.statusChanged( false );
Expand All @@ -117,6 +121,17 @@ function ajax_request( task, post, callback, errcallback ){
//globale Fehlermeldung
errorMessage('Offlinemodus', false);

//force reconnect if clicked on errormsg.
$("div.global.error.message").click( () => {
errorMessage('Neu verbinden ...', false);
ajax_request(
"login",
{ "status" : userinformation.id },
() => {},
() => { errorMessage('Offlinemodus', false);}
);
});

//jetzt offline
systemOfflineMode = true;
systemOfflineManager.statusChanged( true );
Expand Down
2 changes: 1 addition & 1 deletion system/load/notes.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion system/php/systemInit.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ abstract class SystemInit{

//Sytemversion
// [ Hauptversionsnummer, Unternummer, Patch, Zusatz (Alpha, Beta, Final) ] => [1, 23, 5, 'B'] -> 1.23.5 Beta
const SYSTEMVERSION = [ 1, 0, 0, 'Final' ];
const SYSTEMVERSION = [ 1, 0, 1, 'Final' ];

/*
Auslesen der Konfiguration
Expand Down

0 comments on commit a3c5669

Please sign in to comment.