Skip to content

Commit

Permalink
Work on #499, remove desktop notifications
Browse files Browse the repository at this point in the history
  • Loading branch information
@FormerLurker
FormerLurker committed May 8, 2020
1 parent 59a4199 commit c8eb159
Show file tree
Hide file tree
Showing 10 changed files with 55 additions and 54 deletions.
2 changes: 1 addition & 1 deletion octoprint_octolapse/static/js/octolapse.dialog.timelapse_files.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ $(function () {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.Help.showPopupForErrors(
Expand Down
36 changes: 18 additions & 18 deletions octoprint_octolapse/static/js/octolapse.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ $(function () {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopup(options);
Expand Down Expand Up @@ -1521,7 +1521,7 @@ $(function () {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopup(options);
Expand All @@ -1536,7 +1536,7 @@ $(function () {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopup(options);
Expand Down Expand Up @@ -1570,7 +1570,7 @@ $(function () {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopup(options);
Expand Down Expand Up @@ -1642,7 +1642,7 @@ $(function () {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.Help.showPopupForErrors(
Expand All @@ -1667,7 +1667,7 @@ $(function () {
hide: true,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopupForKey(msg_options, "new-profiles-available", "new-profiles-available");
Expand Down Expand Up @@ -1720,7 +1720,7 @@ $(function () {
hide: true,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopup(popup_options);
Expand All @@ -1736,7 +1736,7 @@ $(function () {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopup(popupErrorOptions);
Expand All @@ -1753,7 +1753,7 @@ $(function () {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.Help.showPopupForErrors(printStartPopupoptions, "print-start-error", ["print-start-error"], data["errors"]);
Expand All @@ -1770,7 +1770,7 @@ $(function () {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.Help.showPopupForErrors(printStartPopupoptions, "print-start-error", ["print-start-error"], data["errors"]);
Expand Down Expand Up @@ -1916,7 +1916,7 @@ $(function () {
hide: true,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopupForKey(options,"render_message", ["render_message"]);*/
Expand All @@ -1932,7 +1932,7 @@ $(function () {
hide: true,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopup(renderFailedPopupOptions);
Expand All @@ -1948,7 +1948,7 @@ $(function () {
hide: true,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopup(postRenderFailedPopupOptions);
Expand All @@ -1970,7 +1970,7 @@ $(function () {
hide: true,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopupForKey(options,"render_complete",["render_complete", "render_message"]);*/
Expand All @@ -1990,7 +1990,7 @@ $(function () {
hide: true,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopup(timelapseStoppingPopupOptions);
Expand All @@ -2007,7 +2007,7 @@ $(function () {
hide: true,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopup(timelapseStoppedPopupOptions);
Expand All @@ -2021,7 +2021,7 @@ $(function () {
hide: true,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopupForKey(disabledButRunningPopupOptions, "settings-change-not-applied", ["settings-change-not-applied"]);
Expand All @@ -2035,7 +2035,7 @@ $(function () {
hide: true,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopupForKey(testModeChangedWhileRunningPopupOptions, "settings-change-not-applied", ["settings-change-not-applied"]);
Expand Down
4 changes: 2 additions & 2 deletions octoprint_octolapse/static/js/octolapse.profiles.camera.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ $(function() {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopup(options);
Expand All @@ -136,7 +136,7 @@ $(function() {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopup(options);
Expand Down
13 changes: 7 additions & 6 deletions octoprint_octolapse/static/js/octolapse.profiles.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ $(function() {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false,
icon: null
}
};
Octolapse.displayPopup(options);
Expand Down Expand Up @@ -151,7 +152,7 @@ $(function() {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopup(options);
Expand All @@ -166,7 +167,7 @@ $(function() {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopup(options);
Expand Down Expand Up @@ -199,7 +200,7 @@ $(function() {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopup(options);
Expand All @@ -213,7 +214,7 @@ $(function() {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopup(options);
Expand Down Expand Up @@ -258,7 +259,7 @@ $(function() {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopup(options);
Expand Down
6 changes: 3 additions & 3 deletions octoprint_octolapse/static/js/octolapse.profiles.library.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ $(function() {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopupForKey(
Expand Down Expand Up @@ -503,7 +503,7 @@ $(function() {
hide: true,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopupForKey(
Expand All @@ -523,7 +523,7 @@ $(function() {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopupForKey(
Expand Down
4 changes: 2 additions & 2 deletions octoprint_octolapse/static/js/octolapse.profiles.logging.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ $(function () {
hide: true,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopupForKey(options, "log_file_cleared", "log_file_cleared");
Expand All @@ -162,7 +162,7 @@ $(function () {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopupForKey(options, "log_file_cleared", "log_file_cleared");
Expand Down
6 changes: 3 additions & 3 deletions octoprint_octolapse/static/js/octolapse.settings.import.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ $(function () {
hide: true,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopup(options);
Expand All @@ -91,7 +91,7 @@ $(function () {
hide: false,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopup(options);
Expand Down Expand Up @@ -166,7 +166,7 @@ $(function () {
hide: true,
addclass: "octolapse",
desktop: {
desktop: true
desktop: false
}
};
Octolapse.displayPopup(options);
Expand Down
Loading

0 comments on commit c8eb159

Please sign in to comment.