summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
authorAlex Xu <alex_y_xu@yahoo.ca>2014-03-02 18:14:56 -0500
committerAlex Xu <alex_y_xu@yahoo.ca>2014-03-02 18:14:56 -0500
commit1596e91887b42816dae412c77e17d2979e2e4cd4 (patch)
tree21373acd6915784f4c28eacee505c833f1a04d8b /www/js
parentad86bdc38b6cc17aa03f486df74e25e78d00498e (diff)
downloadhtml5ks-1596e91887b42816dae412c77e17d2979e2e4cd4.tar.xz
html5ks-1596e91887b42816dae412c77e17d2979e2e4cd4.zip
bleh
Diffstat (limited to 'www/js')
-rw-r--r--www/js/api.js6
-rw-r--r--www/js/html5ks.js2
2 files changed, 4 insertions, 4 deletions
diff --git a/www/js/api.js b/www/js/api.js
index 46e8f54..b74c1ae 100644
--- a/www/js/api.js
+++ b/www/js/api.js
@@ -69,7 +69,7 @@ window.html5ks.api = {
_nextType();
},
- play: function (channel, name, ignore, fade) {
+ play: function (channel, name, _, fade) {
this.stop(channel);
var deferred = when.defer(),
audio = html5ks.elements.audio[channel];
@@ -215,7 +215,7 @@ window.html5ks.api = {
},
- window: function (action, transition) {
+ window: function (action) {
var windw = html5ks.elements.window;
switch (action) {
case true:
@@ -504,7 +504,7 @@ window.html5ks.api = {
return deferred.promise;
},
- nvl: function (action, transition) {
+ nvl: function (action) {
var nvl = html5ks.elements.nvl;
switch (action) {
case true:
diff --git a/www/js/html5ks.js b/www/js/html5ks.js
index 73cb249..916426c 100644
--- a/www/js/html5ks.js
+++ b/www/js/html5ks.js
@@ -109,7 +109,7 @@ window.html5ks = {
}
}, 1000);
this._spinners += mod;
- assert(this._spinners >= 0);
+ window.assert(this._spinners >= 0);
},
scale: function () {
var newScale = 1;