Skip to content

Commit

Permalink
Version bump & Fix for double logging
Browse files Browse the repository at this point in the history
  • Loading branch information
matejmosko committed Oct 5, 2017
1 parent 287c97b commit 18477d9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 0 additions & 6 deletions js/console-script.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@
settings.set("defaultPath", path.dirname(fileNames[0]))
if (fileNames === undefined) {
saveLogs(i18n.__("No file selected"));
console.log(i18n.__("No file selected"));
return;
}
loadProjectionFile(fileNames[0]);
Expand Down Expand Up @@ -195,7 +194,6 @@
// Add the error event listener
unzipper.on('error', function(err) {
saveLogs(i18n.__('Unzip with decompress-zip failed'), err);
console.log(i18n.__('Unzip with decompress-zip failed'), err);
});

// Notify when everything is extracted
Expand All @@ -211,7 +209,6 @@
break;
default:
saveLogs(i18n.__("Something went wrong. Wrong file is loaded."));
console.log(i18n.__("Something went wrong. Wrong file is loaded."));
}
});

Expand Down Expand Up @@ -241,7 +238,6 @@
html = el.getElementById("impress").outerHTML; // Grab <div id="impress">...</div> and place it inside our template.
} catch (err) {
saveLogs("There is a problem with a file you selected");
console.log("There is a problem with a file you selected");
return;
}
let dataPath = path.dirname(file) + "/"; // Baseurl for the presentation (for relative links to work inside presentation)
Expand Down Expand Up @@ -291,7 +287,6 @@
webview0.openDevTools();
webview0.addEventListener('console-message', (e) => {
saveLogs('Guest page logged a message:', e.message);
console.log('Guest page logged a message:', e.message);
})
}
}
Expand Down Expand Up @@ -455,7 +450,6 @@
break;
default:
saveLogs(i18n.__("There is something new coming from impress.js."));
console.log(i18n.__("There is something new coming from impress.js."));
}
});

Expand Down
6 changes: 6 additions & 0 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,19 @@ function saveTemplates() {

function storeWindowState() {
if (typeof(impWindows.main) === "object") {
if (typeof(windowState.main) !== "object"){
windowState.main = {};
}
windowState.main.isMaximized = impWindows.main.isMaximized();
if (!windowState.main.isMaximized) {
// only update bounds if the window isn't currently maximized
windowState.main.bounds = impWindows.main.getBounds();
}
}
if (typeof(impWindows.projector) === "object") {
if (typeof(windowState.projector) !== "object"){
windowState.projector = {};
}
windowState.projector.isMaximized = impWindows.projector.isMaximized();
if (!windowState.projector.isMaximized) {
// only update bounds if the window isn't currently maximized
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "impressPlayer",
"version": "0.8.1",
"version": "0.8.2",
"description": "Standalone impress.js presentations viewer and controller. Accepts html, markdown and specifically structured zip.",
"main": "main.js",
"scripts": {
Expand Down

0 comments on commit 18477d9

Please sign in to comment.