From 61603913c0a096e854a9300c0946a50529351316 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Tue, 19 Apr 2016 08:48:24 +0200 Subject: [PATCH] MOBILE-1470 url: Handle mod_url pointing to the same site --- www/addons/mod_url/services/url.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/www/addons/mod_url/services/url.js b/www/addons/mod_url/services/url.js index 08a2e64efec..f1fe95f71d6 100644 --- a/www/addons/mod_url/services/url.js +++ b/www/addons/mod_url/services/url.js @@ -21,7 +21,7 @@ angular.module('mm.addons.mod_url') * @ngdoc service * @name $mmaModUrl */ -.factory('$mmaModUrl', function($mmSite, $mmUtil, $q) { +.factory('$mmaModUrl', function($mmSite, $mmUtil, $q, $mmContentLinksHelper) { var self = {}; /** @@ -52,7 +52,14 @@ angular.module('mm.addons.mod_url') * @param {String} url The URL to go to. */ self.open = function(url) { - $mmUtil.openInBrowser(url); + var modal = $mmUtil.showModalLoading(); + $mmContentLinksHelper.handleLink(url).then(function(treated) { + if (!treated) { + $mmUtil.openInBrowser(url); + } + }).finally(function() { + modal.dismiss(); + }); }; return self;