From 3d27e0ce8ab0194473e6a477f7e8a60e19a32a37 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Sat, 29 Dec 2018 01:03:32 +0000 Subject: [PATCH] Revert "Fix plugin .url() calculation when loaded from bundle" This reverts commit b3251139803c4f7dc2bfb18c0815440e8d5983cd. Reason for revert: This never passed the Gerrit-CI validation and actually broke the build. Change-Id: Ib30ff6a4cae7c8927fa212dd5ae8b87c0cd0d9ef --- .../gr-js-api-interface/gr-js-api-interface_test.html | 4 ++-- .../shared/gr-js-api-interface/gr-public-js-api.js | 11 +++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-js-api-interface_test.html b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-js-api-interface_test.html index 78fba830bb..e0c7c37f04 100644 --- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-js-api-interface_test.html +++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-js-api-interface_test.html @@ -441,11 +441,11 @@ limitations under the License. test('installing preloaded plugin', () => { let plugin; - window.ASSETS_PATH = 'http://blips.com/chitz'; + window.ASSETS_PATH = 'http://blips.com/chitz/'; Gerrit.install(p => { plugin = p; }, '0.1', 'preloaded:foo'); assert.strictEqual(plugin.getPluginName(), 'foo'); assert.strictEqual(plugin.url('/some/thing.html'), - 'http://blips.com/chitz/plugins/foo/some/thing.html'); + 'http://blips.com/plugins/foo/some/thing.html'); delete window.ASSETS_PATH; }); diff --git a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-public-js-api.js b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-public-js-api.js index 8bf4a2d800..36a428d966 100644 --- a/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-public-js-api.js +++ b/polygerrit-ui/app/elements/shared/gr-js-api-interface/gr-public-js-api.js @@ -217,14 +217,9 @@ }; Plugin.prototype.url = function(opt_path) { - const relPath = '/plugins/' + this._name + (opt_path || '/'); - if (window.location.origin === this._url.origin) { - // Plugin loaded from the same origin as gr-app, getBaseUrl in effect. - return this._url.origin + Gerrit.BaseUrlBehavior.getBaseUrl() + relPath; - } else { - // Plugin loaded from assets bundle, expect assets placed along with it. - return this._url.href.split('/plugins/' + this._name)[0] + relPath; - } + const base = Gerrit.BaseUrlBehavior.getBaseUrl(); + return this._url.origin + base + '/plugins/' + + this._name + (opt_path || '/'); }; Plugin.prototype.screenUrl = function(opt_screenName) {