Merge pull request #522 from Sunbird-Knowlg/release-7.7.0

Merge Release 7.7.0 into 8.0.0

Author: pallakartheekreddy

player/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@project-sunbird/content-player",
-    "version": "5.1.0",
+    "version": "8.0.0",
     "description": "Which renders the contents in both web and devices",
     "dependencies": {
         "@project-sunbird/telemetry-sdk": "^0.0.14",

player/public/libs/plugin-framework.min.js

@@ -700,20 +700,29 @@ org.ekstep.pluginframework.resourceManager = new(Class.extend({
         }
     },
     loadResource: function(url, dataType, callback, publishedTime) {
-        url = url + "?" + (org.ekstep.pluginframework.config ? org.ekstep.pluginframework.config.build_number : '');
+        var cleanUrl = (url || '').replace('??', '?');
+        var buildNumber = (org.ekstep.pluginframework.config ? org.ekstep.pluginframework.config.build_number : '');
+        if (buildNumber) {
+            cleanUrl = cleanUrl + (cleanUrl.indexOf('?') !== -1 ? '&' : '?') + buildNumber;
+        }
         if (publishedTime) {
-            url = url + "&" + publishedTime;
+            cleanUrl = cleanUrl + (cleanUrl.indexOf('?') !== -1 ? '&' : '?') + publishedTime;
+        }
+        var finalDataType = dataType;
+        if (finalDataType === 'script' && cleanUrl.indexOf(".html")!==-1) {
+            finalDataType = 'text';
         }
         org.ekstep.pluginframework.jQuery.ajax({
             async: false,
-            url: url,
-            dataType: dataType
+            url: cleanUrl,
+            dataType: finalDataType,
+            cache: false,
+            crossDomain: true,
+            timeout: 30000
         }).done(function(data) {
             callback(null, data);
         }).fail(function(jqXHR, textStatus, errorThrown) {
-            if(jqXHR.statusText === 'OK') {
-                console.log('Unable to load resource:', url, 'error:', errorThrown);
-            }
+            console.log('Unable to load resource:', url, 'error:', errorThrown);
             callback(errorThrown)
         });
     }
@@ -1869,4 +1878,4 @@ org.ekstep.pluginframework.publishedRepo = new(org.ekstep.pluginframework.iRepo.
       return org.ekstep.pluginframework.config.pluginRepo + "/" + id + "-" + ver + "/" + resource;
     }
 }));
-org.ekstep.pluginframework.resourceManager.addRepo(org.ekstep.pluginframework.publishedRepo);
+org.ekstep.pluginframework.resourceManager.addRepo(org.ekstep.pluginframework.publishedRepo);