diff options
| -rw-r--r-- | res/client.js | 11 | ||||
| -rw-r--r-- | res/langs/en.json | 2 | ||||
| -rw-r--r-- | src/client/Main.hx | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/res/client.js b/res/client.js index c0571cb..89c5829 100644 --- a/res/client.js +++ b/res/client.js @@ -1771,8 +1771,15 @@ client_Main.prototype = { url = "" + protocol + "//" + url; } } - this.player.getVideoData({ url : url, atEnd : atEnd},function(data) { + var obj = { url : url, atEnd : atEnd}; + if(doCache) { + this.showProgressInfo(Lang.get("caching") + "..."); + } + this.player.getVideoData(obj,function(data) { if(data.duration == 0) { + if(doCache) { + _gthis.hideDynamicChin(); + } _gthis.serverMessage(Lang.get("addVideoError")); return; } @@ -1847,7 +1854,7 @@ client_Main.prototype = { var data = JSON.parse(e.data); if(this.config != null && this.config.isVerbose) { var t = data.type; - haxe_Log.trace("Event: " + data.type,{ fileName : "src/client/Main.hx", lineNumber : 545, className : "client.Main", methodName : "onMessage", customParams : [Reflect.field(data,t.charAt(0).toLowerCase() + HxOverrides.substr(t,1,null))]}); + haxe_Log.trace("Event: " + data.type,{ fileName : "src/client/Main.hx", lineNumber : 547, className : "client.Main", methodName : "onMessage", customParams : [Reflect.field(data,t.charAt(0).toLowerCase() + HxOverrides.substr(t,1,null))]}); } client_JsApi.fireEvents(data); switch(data.type) { diff --git a/res/langs/en.json b/res/langs/en.json index acdcf86..e0190c6 100644 --- a/res/langs/en.json +++ b/res/langs/en.json @@ -27,7 +27,7 @@ "videoAlreadyExistsError": "The video already exists in playlist.", "addVideoError": "Failed to add video.", "adminsCannotBeBannedError": "Admins cannot be banned. Remove them first.", - "caching": "Caching", + "caching": "Caching on Remote", "downloading": "Downloading", "uploading": "Uploading", "rawVideo": "Raw video", diff --git a/src/client/Main.hx b/src/client/Main.hx index bea6b6b..62c12f8 100644 --- a/src/client/Main.hx +++ b/src/client/Main.hx @@ -424,8 +424,10 @@ class Main { url: url, atEnd: atEnd }; + if (doCache) showProgressInfo(Lang.get("caching") + "..."); player.getVideoData(obj, (data:VideoData) -> { if (data.duration == 0) { + if (doCache) hideDynamicChin(); serverMessage(Lang.get("addVideoError")); return; } |