Skip to content

Commit 6160391

Browse files
committed
MOBILE-1470 url: Handle mod_url pointing to the same site
1 parent 61be938 commit 6160391

File tree

1 file changed

+9
-2
lines changed
  • www/addons/mod_url/services

1 file changed

+9
-2
lines changed

www/addons/mod_url/services/url.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_url')
2121
* @ngdoc service
2222
* @name $mmaModUrl
2323
*/
24-
.factory('$mmaModUrl', function($mmSite, $mmUtil, $q) {
24+
.factory('$mmaModUrl', function($mmSite, $mmUtil, $q, $mmContentLinksHelper) {
2525
var self = {};
2626

2727
/**
@@ -52,7 +52,14 @@ angular.module('mm.addons.mod_url')
5252
* @param {String} url The URL to go to.
5353
*/
5454
self.open = function(url) {
55-
$mmUtil.openInBrowser(url);
55+
var modal = $mmUtil.showModalLoading();
56+
$mmContentLinksHelper.handleLink(url).then(function(treated) {
57+
if (!treated) {
58+
$mmUtil.openInBrowser(url);
59+
}
60+
}).finally(function() {
61+
modal.dismiss();
62+
});
5663
};
5764

5865
return self;

0 commit comments

Comments
 (0)