From 1076527b6215eddf9220d979f6fccd0e983b4aa2 Mon Sep 17 00:00:00 2001 From: Athou Date: Wed, 14 Aug 2013 10:43:10 +0200 Subject: [PATCH] make chrome think every bookmark click is a different url in order to create history entries (fix #488) --- src/main/webapp/js/controllers.js | 1 + src/main/webapp/js/main.js | 5 +++-- src/main/webapp/templates/feeds.help.html | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/js/controllers.js b/src/main/webapp/js/controllers.js index ca2a2f13..3e2ec37f 100644 --- a/src/main/webapp/js/controllers.js +++ b/src/main/webapp/js/controllers.js @@ -1406,6 +1406,7 @@ module.controller('HelpController', ['$scope', 'CategoryService', 'AnalyticsServ $scope.infos = ServerService.get(); $scope.categoryId = 'all'; $scope.order = 'desc'; + $scope.baseUrl = window.location.href.substring(0, window.location.href.lastIndexOf('#')); }]); diff --git a/src/main/webapp/js/main.js b/src/main/webapp/js/main.js index 9b70d978..b76bb4a9 100644 --- a/src/main/webapp/js/main.js +++ b/src/main/webapp/js/main.js @@ -1,9 +1,10 @@ var app = angular.module('commafeed', ['ui', 'ui.bootstrap', 'ui.state', 'commafeed.directives', 'commafeed.controllers', 'commafeed.services', 'commafeed.filters', 'ngSanitize', 'infinite-scroll', 'ngGrid']); -app.config(['$routeProvider', '$stateProvider', '$urlRouterProvider', '$httpProvider', - function($routeProvider, $stateProvider, $urlRouterProvider, $httpProvider) { +app.config(['$routeProvider', '$stateProvider', '$urlRouterProvider', '$httpProvider', '$compileProvider', + function($routeProvider, $stateProvider, $urlRouterProvider, $httpProvider, $compileProvider) { + $compileProvider.urlSanitizationWhitelist(/^\s*(https?|ftp|mailto|javascript):/); var interceptor = ['$rootScope', '$q', function(scope, $q) { var success = function(response) { diff --git a/src/main/webapp/templates/feeds.help.html b/src/main/webapp/templates/feeds.help.html index 45147dbd..7bcdb3e7 100644 --- a/src/main/webapp/templates/feeds.help.html +++ b/src/main/webapp/templates/feeds.help.html @@ -69,7 +69,7 @@ - ${global.link} + ${global.link}