ContextPath Prefixed for multiple calls via $.ajax/.getJson & more

- Fixes Issue brightcove#64
friendlymahi · Dec 9, 2023 · 9140ed0 · 9140ed0
1 parent 035c9d8
commit 9140ed0
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 22 deletions.
diff --git a/...root/apps/brightcove/clientlibs/brightcove-asset-finder/source/js/asset_content_finder.js b/...root/apps/brightcove/clientlibs/brightcove-asset-finder/source/js/asset_content_finder.js
@@ -4,7 +4,7 @@
         CONTENT_FINDER_NAME = 'Brightcove Videos';
 
     // Get Brightcove Videos Asset Path from OSGI Config
-    $.getJSON("/bin/brightcove/getBrightcoveAssetPath.json").done(function(data){
+    $.getJSON(Granite.HTTP.externalize("/bin/brightcove/getBrightcoveAssetPath.json")).done(function(data){
         assetPath = data["brightcoveAssetPath"];
 
         getBrightcoveAssetsPath(assetPath);

diff --git a/...cr_root/apps/brightcove/clientlibs/brightcove-author-widget/source/js/dynamic_dropdown.js b/...cr_root/apps/brightcove/clientlibs/brightcove-author-widget/source/js/dynamic_dropdown.js
@@ -37,7 +37,7 @@
             var ACTION = 'playlists';
             var CONDITION = ( $(DIALOG_PLAYLIST_FIELD_SELECTOR).length > 0 ) ? existingValues.videoPlayerPL : existingValues.videoPlayer;
 
-            $.getJSON("/bin/brightcove/getLocalVideoList.json", {
+            $.getJSON(Granite.HTTP.externalize("/bin/brightcove/getLocalVideoList.json"), {
                 source: ACTION,
                 account_id: account_id
             }).done(function(data) {
@@ -87,7 +87,7 @@
             accountSelector.addEventListener('coral-select:showitems', function(event) {
                 accountSelector.items.clear();
                 if (accountSelector.items.length == 0) {
-                    $.getJSON("/bin/brightcove/accounts.json").done(function(data) {
+                    $.getJSON(Granite.HTTP.externalize("/bin/brightcove/accounts.json")).done(function(data) {
                         var accounts = data.accounts;
                         event.preventDefault();
                         accounts.forEach(function(value, index) {
@@ -126,7 +126,7 @@
                             ? accountSelector.selectedItem.value : "";
 
                 if (playerSelector.items.length == 0) {
-                    $.getJSON("/bin/brightcove/getLocalVideoList.json", {
+                    $.getJSON(Granite.HTTP.externalize("/bin/brightcove/getLocalVideoList.json"), {
                         source: 'players',
                         account_id: account_id
                     }).done(function(data) {

diff --git a/...ent/jcr_root/apps/brightcove/clientlibs/brightcove-author-widget/source/js/experiences.js b/...ent/jcr_root/apps/brightcove/clientlibs/brightcove-author-widget/source/js/experiences.js
@@ -36,7 +36,7 @@
 
             accountSelector.addEventListener('coral-select:showitems', function(event) {
                 if (accountSelector.items.length == 0) {
-                    $.getJSON("/bin/brightcove/accounts.json").done(function(data) {
+                    $.getJSON(Granite.HTTP.externalize("/bin/brightcove/accounts.json")).done(function(data) {
                         var accounts = data.accounts;
                         var selected;
                         event.preventDefault();

diff --git a/...n/content/jcr_root/apps/brightcove/components/page/brightcoveplayer/clientlib/listener.js b/...n/content/jcr_root/apps/brightcove/components/page/brightcoveplayer/clientlib/listener.js
@@ -56,7 +56,7 @@
             $("[role='option']",playerID._selectList).remove();
 
             var x = $("[name='./playerID']").closest(".coral-Select").find('option').remove().end();
-            $.getJSON("/bin/brightcove/api?a=players&account_id="+selectedAccount).done(function(data){
+            $.getJSON(Granite.HTTP.externalize("/bin/brightcove/api?a=players&account_id="+selectedAccount)).done(function(data){
                 _.each(data.items, function(value, id) {
                     var test2 = $("[name='./playerID']")[0];
                     $("<option "+(selectedPlayer === value.id ? "selected" : "")+" >").appendTo(test2).val(value.id).html(value.name);

diff --git a/...ntent/jcr_root/apps/brightcove/components/tools/brightcoveadmin/clientlibs/js/brcAdmin.js b/...ntent/jcr_root/apps/brightcove/components/tools/brightcoveadmin/clientlibs/js/brcAdmin.js
@@ -33,7 +33,7 @@
 //CONFIG
 
 var brc_admin = brc_admin || {},
-    apiLocation = brc_admin.apiProxy; //This should be set to point to proxy.jsp on your server
+    apiLocation = Granite.HTTP.externalize(brc_admin.apiProxy); //This should be set to point to proxy.jsp on your server
 
 
 //Default Fields

diff --git a/.../content/jcr_root/apps/brightcove/components/tools/brightcoveadmin/clientlibs/js/brcUI.js b/.../content/jcr_root/apps/brightcove/components/tools/brightcoveadmin/clientlibs/js/brcUI.js
@@ -158,7 +158,7 @@ $(function () {
                         };
                         $.ajax({
                             type: 'GET',
-                            url: '/bin/brightcove/api.js',
+                            url: Granite.HTTP.externalize('/bin/brightcove/api.js'),
                             data: data,
                             async: true,
                             success: function (data)
@@ -188,7 +188,7 @@ $(function () {
             };
             $.ajax({
                 type: 'GET',
-                url: '/bin/brightcove/api.js',
+                url: Granite.HTTP.externalize('/bin/brightcove/api.js'),
                 data: data,
                 async: true,
                 success: function (data)
@@ -213,7 +213,7 @@ $(function () {
             };
             $.ajax({
                 type: 'GET',
-                url: '/bin/brightcove/api.js',
+                url: Granite.HTTP.externalize('/bin/brightcove/api.js'),
                 data: data,
                 async: true,
                 success: function (data)
@@ -240,7 +240,7 @@ $(function () {
                 };
                 $.ajax({
                     type: 'GET',
-                    url: '/bin/brightcove/api.js',
+                    url: Granite.HTTP.externalize('/bin/brightcove/api.js'),
                     data: data,
                     async: true,
                     success: function (data)
@@ -257,7 +257,7 @@ $(function () {
                 };
                 $.ajax({
                     type: 'GET',
-                    url: '/bin/brightcove/api.js',
+                    url: Granite.HTTP.externalize('/bin/brightcove/api.js'),
                     data: data,
                     async: true,
                     success: function (data)
@@ -464,7 +464,7 @@ function loadFolders() {
     };
     $.ajax({
         type: 'GET',
-        url: '/bin/brightcove/api.js',
+        url: Granite.HTTP.externalize('/bin/brightcove/api.js'),
         data: data,
         async: true,
         success: function (data)
@@ -520,7 +520,7 @@ function loadLabels() {
                         };
                         $.ajax({
                             type: 'GET',
-                            url: '/bin/brightcove/api.js',
+                            url: Granite.HTTP.externalize('/bin/brightcove/api.js'),
                             data: data,
                             async: true,
                             success: function (data)
@@ -549,7 +549,7 @@ function loadLabels() {
     };
     $.ajax({
         type: 'GET',
-        url: '/bin/brightcove/api.js',
+        url: Granite.HTTP.externalize('/bin/brightcove/api.js'),
         data: data,
         async: true,
         success: function (data)
@@ -585,7 +585,7 @@ function editLabels(event) {
 
         $.ajax({
             type: 'GET',
-            url: '/bin/brightcove/api.js',
+            url: Granite.HTTP.externalize('/bin/brightcove/api.js'),
             data: $.param(playlistData, true),
             async: true,
             success: function (data)
@@ -627,7 +627,7 @@ function editPlaylistHandler(event) {
 
     $.ajax({
         type: 'GET',
-        url: '/bin/brightcove/api.js',
+        url: Granite.HTTP.externalize('/bin/brightcove/api.js'),
         data: data,
         async: true,
         success: function (data)
@@ -654,7 +654,7 @@ function editPlaylistListingCallback(data) {
 
         $.ajax({
             type: 'GET',
-            url: '/bin/brightcove/api.js',
+            url: Granite.HTTP.externalize('/bin/brightcove/api.js'),
             data: $.param(playlistData, true),
             async: true,
             success: function (data)
@@ -1180,7 +1180,7 @@ CQ.Ext.brightcove.economics = new CQ.Ext.data.JsonStore({
 function syncDB()
 {
     syncStart();
-    var url = window.location.origin + "/bin/brightcove/dataload";
+    var url = window.location.origin + CQ.shared.HTTP.getContextPath()+ "/bin/brightcove/dataload";
     data = "account_id="+$("#selAccount").val();
     $.ajax({
         type: 'GET',

diff --git a/...s/src/main/content/jcr_root/apps/brightcove/extensions/contentfinder/brightcovePlayers.js b/...s/src/main/content/jcr_root/apps/brightcove/extensions/contentfinder/brightcovePlayers.js
@@ -101,7 +101,7 @@
                 CQ.wcm.ContentFinderTab.REFRESH_BUTTON
             ]
         },{
-            "url": "/bin/brightcove/api.json?a=local_players"
+            "url": CQ.shared.HTTP.getContextPath() +"/bin/brightcove/api.json?a=local_players"
         },{
             "autoLoad":false,
             "reader": new CQ.Ext.data.JsonReader({

diff --git a/.../src/main/content/jcr_root/apps/brightcove/extensions/contentfinder/brightcovePlaylist.js b/.../src/main/content/jcr_root/apps/brightcove/extensions/contentfinder/brightcovePlaylist.js
@@ -113,7 +113,7 @@
                 }
             ]
         },{
-            "url": "/bin/brightcove/api?a=list_playlists"
+            "url": CQ.shared.HTTP.getContextPath() +"/bin/brightcove/api?a=list_playlists"
         },{
             "autoLoad":false,
             "reader": new CQ.Ext.data.JsonReader({

diff --git a/...pps/src/main/content/jcr_root/apps/brightcove/extensions/contentfinder/brightcoveVideo.js b/...pps/src/main/content/jcr_root/apps/brightcove/extensions/contentfinder/brightcoveVideo.js
@@ -113,7 +113,7 @@
                 }
             ]
         },{
-            "url": "/bin/brightcove/api?a=list_videos"
+            "url": CQ.shared.HTTP.getContextPath() +"/bin/brightcove/api?a=list_videos"
         },{
             "autoLoad":false,
             "reader": new CQ.Ext.data.JsonReader({