From 10d83c0e5e3a1e9143008dcd70515d2d4ded3c86 Mon Sep 17 00:00:00 2001 From: Alex Xu Date: Sun, 6 Apr 2014 18:05:27 -0400 Subject: more stuff --- www/js/api.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'www/js/api.js') diff --git a/www/js/api.js b/www/js/api.js index b8c2f28..6b5f177 100644 --- a/www/js/api.js +++ b/www/js/api.js @@ -191,16 +191,15 @@ window.html5ks.api = { iscene: function (target, is_h, is_end) { html5ks.store.status = "scene"; var deferred = when.defer(), - label = html5ks.data.script[html5ks.persistent.language + "_" + target], + real_target = html5ks.persistent.language + "_" + target, i = 0; - (function run(ret) { - if (label[i]) { - html5ks.api.runInst(label[i]).then(run, console.error); - i++; + html5ks.fetch('script', html5ks.data.s2s[real_target]).then(function (l) { + if (l[i]) { + html5ks.api.runInst(l[i++]).then(run, console.error); } else { - deferred.resolve(ret); + deferred.resolve(); } - }()); + }, deferred.reject); return deferred.promise; }, -- cgit v1.2.3-54-g00ecf