diff options
author | dizzy <diosmosis@users.noreply.github.com> | 2021-10-13 06:55:33 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-13 06:55:33 +0300 |
commit | b5e591c7d70fe64c5a3d375812d9e1bc20b25558 (patch) | |
tree | 98fa10365dbb5a2fca9bd9687c8cd447f82f070e /plugins/CoreHome/angularjs | |
parent | 68674d8fdf1464e0342f8413372ae702e7b7bc43 (diff) |
[Vue] add promise api to ajaxHelper and deprecate piwikApi service (#18114)
* incomplete conversion
* get ajax helper migration to work
* delete old periods.spec.js
* remove global-ajax-queue.js file
* migrate piwik service and test (w/ hacks to get it the test to work)
* rebuild and remove old files + get tests to pass
* unfinished commit
* return jqxhr object so promise api can be used
* move hasBlockedContent and deprecate piwikApi service
* remove alert files
* convert piwikHelper.spec.js
* in new vue code, use "Matomo" everywhere possible instead of "piwik" and rebuild vue files
* add another needed export line in command
* include polyfills after vue so we can add to vue engine
* Add HTML sanitizer for use w/ migrating ng-bind-html uses.
* fix broken merge, rebuild js, fix issue in build command
* add sanitize to other components for consistency (will be replaced by utility function eventually)
* add output when no plugins to build
* update expected screenshot
Diffstat (limited to 'plugins/CoreHome/angularjs')
4 files changed, 4 insertions, 72 deletions
diff --git a/plugins/CoreHome/angularjs/alert/alert.directive.html b/plugins/CoreHome/angularjs/alert/alert.directive.html deleted file mode 100644 index c45b3713d9..0000000000 --- a/plugins/CoreHome/angularjs/alert/alert.directive.html +++ /dev/null @@ -1,2 +0,0 @@ -<div class="alert alert-{{severity}}" ng-transclude> -</div>
\ No newline at end of file diff --git a/plugins/CoreHome/angularjs/alert/alert.directive.js b/plugins/CoreHome/angularjs/alert/alert.directive.js deleted file mode 100644 index 053b3c3835..0000000000 --- a/plugins/CoreHome/angularjs/alert/alert.directive.js +++ /dev/null @@ -1,26 +0,0 @@ -/*! - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ - -/** - * Usage: - * <div piwik-alert> - */ -(function () { - angular.module('piwikApp').directive('piwikAlert', piwikAlert); - - piwikAlert.$inject = ['piwik']; - - function piwikAlert(piwik){ - - return { - restrict: 'A', - transclude: true, - scope: {severity: '@piwikAlert'}, - templateUrl: 'plugins/CoreHome/angularjs/alert/alert.directive.html?cb=' + piwik.cacheBuster - }; - } -})();
\ No newline at end of file diff --git a/plugins/CoreHome/angularjs/common/services/piwik-api.js b/plugins/CoreHome/angularjs/common/services/piwik-api.js index b9a8a9fb2f..8436ea5900 100644 --- a/plugins/CoreHome/angularjs/common/services/piwik-api.js +++ b/plugins/CoreHome/angularjs/common/services/piwik-api.js @@ -5,14 +5,14 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later */ -// see https://github.com/piwik/piwik/issues/5094 used to detect an ad blocker -var hasBlockedContent = false; - (function () { angular.module('piwikApp.service').factory('piwikApi', piwikApiService); piwikApiService.$inject = ['$http', '$q', '$rootScope', 'piwik', '$window', 'piwikUrl']; + /** + * @deprecated use AjaxHelper's promise API instead + */ function piwikApiService ($http, $q, $rootScope, piwik, $window, piwikUrl) { var url = 'index.php'; @@ -348,4 +348,4 @@ var hasBlockedContent = false; mixinDefaultGetParams: mixinDefaultGetParams }; } -})();
\ No newline at end of file +})(); diff --git a/plugins/CoreHome/angularjs/common/services/piwik-helper.spec.js b/plugins/CoreHome/angularjs/common/services/piwik-helper.spec.js deleted file mode 100644 index a80546b9d6..0000000000 --- a/plugins/CoreHome/angularjs/common/services/piwik-helper.spec.js +++ /dev/null @@ -1,40 +0,0 @@ -/*! - * Matomo - free/libre analytics platform - * - * @link https://matomo.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ -(function () { - describe('piwikHelper', function() { - var piwikHelper; - - beforeEach(module('piwikApp.service')); - beforeEach(inject(function ($injector) { - piwikHelper = $injector.get('piwik').helper; - })); - beforeEach(function () { - delete window._dosomething; - }); - - describe('#htmlDecode', function () { - - it('should correctly decode html entities', function (done) { - var called = false; - window._dosomething = function () { - called = true; - }; - - var encoded = 'str <img src=\'x/\' onerror=\'_dosomething()\'/>'; - var decoded = piwikHelper.htmlDecode(encoded); - - setTimeout(function () { - expect(called).to.be.false; - expect(decoded).to.equal('str <img src=\'x/\' onerror=\'_dosomething()\'/>'); - done(); - }, 500); - }); - - }); - }); - -})();
\ No newline at end of file |