restored hosted version

guancio · Nov 10, 2013 · 72a303e · 72a303e
1 parent ec10862
commit 72a303e
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 10 deletions.
diff --git a/hostedapp/manifest.json b/hostedapp/manifest.json
diff --git a/hostedapp/manifest.json b/hostedapp/manifest.json
@@ -0,0 +1,18 @@
+{
+  "name": "Subtitle Videoplayer Hosted",
+  "version": "1.6.0",
+  "manifest_version": 2,
+  "icons": {
+    "16": "camera.png",
+    "128": "camera.png"
+  },
+  "app": {
+    "urls": [
+        "https://subtitlevideoplayer.appspot.com/static/ChromeOsSubtitle/src/"
+    ],
+    "launch": {
+      "web_url": "https://subtitlevideoplayer.appspot.com/static/ChromeOsSubtitle/src/index.html"
+    }
+  },
+  "offline_enabled": true
+}
diff --git a/hostedapp/manifest_dell.json b/hostedapp/manifest_dell.json
@@ -1,17 +1,17 @@
 {
   "name": "Subtitle Videoplayer Hosted",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "manifest_version": 2,
   "icons": {
     "16": "camera.png",
     "128": "camera.png"
   },
   "app": {
     "urls": [
-        "http://localhost"
+        "http://localhost:8080/static/ChromeOsSubtitle/src/"
     ],
     "launch": {
-      "web_url": "http://localhost:8000/content/index.html"
+      "web_url": "http://localhost:8080/static/ChromeOsSubtitle/src/index.html"
     }
   },
   "offline_enabled": true

diff --git a/hostedapp/manifest_git.json b/hostedapp/manifest_git.json
@@ -1,6 +1,6 @@
 {
   "name": "Subtitle Videoplayer Hosted",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "manifest_version": 2,
   "icons": {
     "16": "camera.png",

diff --git a/src/appcache b/src/appcache
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# version 1.6.0.z.1
+# version 1.6.0.z.4
     background.png
     index.html
     mediaelementplayer.min.css

diff --git a/src/index.html b/src/index.html
@@ -1,4 +1,5 @@
 <html manifest="appcache" style="overflow: hidden;">
+
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title>Subtitle Videoplayer</title>

diff --git a/src/js/mep-feature-tracks.js b/src/js/mep-feature-tracks.js
@@ -1,5 +1,5 @@
 
-zip.workerScriptsPath = mediaelement_url + "/lib/zip.js/WebContent/";
+zip.workerScriptsPath = mediaelement_url + "lib/zip.js/WebContent/";
 
 (function($) {
 

diff --git a/src/js/opensubtitle.js b/src/js/opensubtitle.js
@@ -1,4 +1,11 @@
 var packaged_app = (window.location.origin.indexOf("chrome-extension") == 0);
+var host = "http://api.opensubtitles.org/xml-rpc";
+if (!packaged_app) {
+    if (window.location.origin.indexOf("localhost") == 0)
+	host = "http://localhost:8080/xml-rpc";
+    else
+	host = window.location.origin + "/xml-rpc";
+}
 
 function b64toBlob(b64Data, contentType, sliceSize) {
     contentType = contentType || '';
@@ -80,9 +87,6 @@ var openSubsLang = [
 	    var 
 	    t = this;
 
-	    var host = "http://api.opensubtitles.org/xml-rpc";
-	    if (!packaged_app)
-		host = "http://localhost:8080/xml-rpc";
 	    var service = new rpc.ServiceProxy(host, {
 		sanitize: false,
 		protocol: "XML-RPC",