Skip to content

Sounds #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 30, 2014
Merged

Sounds #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fefc889
Provide config for alert sounds instead of hard-coding
PeterChaplin Jul 30, 2014
a7c6d89
Concat
PeterChaplin Jul 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions js/qcode.alert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,8 @@
var qcode = qcode || {};

(function($, undefined) {
var ding;
var alertQueue = [];
var timeoutID;
$(function() {
if ( qcode.Sound.supported ) {
ding = new qcode.Sound('/Sounds/Windows%20Ding.wav');
}
});

function showNextMessage() {
if ( alertQueue.length > 0 && timeoutID === undefined ) {
Expand Down Expand Up @@ -69,12 +63,13 @@ var qcode = qcode || {};
showNextMessage();
}
});
if ( qcode.Sound && qcode.Sound.supported ) {
ding.play();
if ( qcode.Sound && qcode.Sound.supported && qcode.alert.config.sound ) {
qcode.alert.config.sound.play();
}
});
showNextMessage();
}
qcode.alert.config = {};

qcode.confirm = function(message, onConfirm) {
alertQueue.push(function() {
Expand Down Expand Up @@ -125,10 +120,11 @@ var qcode = qcode || {};
showNextMessage();
}
});
if ( qcode.Sound && qcode.Sound.supported ) {
ding.play();
if ( qcode.Sound && qcode.Sound.supported && qcode.confirm.config.sound ) {
qcode.confirm.config.sound.play();
}
});
showNextMessage();
}
qcode.confirm.config = {};
})(jQuery);
16 changes: 6 additions & 10 deletions qcode-ui-3.12.5.js → qcode-ui-3.13.0.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8651,14 +8651,8 @@ function preloadImages() {
var qcode = qcode || {};

(function($, undefined) {
var ding;
var alertQueue = [];
var timeoutID;
$(function() {
if ( qcode.Sound.supported ) {
ding = new qcode.Sound('/Sounds/Windows%20Ding.wav');
}
});

function showNextMessage() {
if ( alertQueue.length > 0 && timeoutID === undefined ) {
Expand Down Expand Up @@ -8703,12 +8697,13 @@ var qcode = qcode || {};
showNextMessage();
}
});
if ( qcode.Sound && qcode.Sound.supported ) {
ding.play();
if ( qcode.Sound && qcode.Sound.supported && qcode.alert.config.sound ) {
qcode.alert.config.sound.play();
}
});
showNextMessage();
}
qcode.alert.config = {};

qcode.confirm = function(message, onConfirm) {
alertQueue.push(function() {
Expand Down Expand Up @@ -8759,12 +8754,13 @@ var qcode = qcode || {};
showNextMessage();
}
});
if ( qcode.Sound && qcode.Sound.supported ) {
ding.play();
if ( qcode.Sound && qcode.Sound.supported && qcode.confirm.config.sound ) {
qcode.confirm.config.sound.play();
}
});
showNextMessage();
}
qcode.confirm.config = {};
})(jQuery);

/* ==== qcode.sound.js ==== */
Expand Down