From c84e7a83078e0764314abbfd5062cda9c1507cf9 Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Tue, 26 May 2015 09:34:09 +0200
Subject: [PATCH] Remove scrolling to the site being edited as it's very
confusing and not particularly helpful
---
plugins/SitesManager/SitesManager.php | 1 -
.../sites-manager/scroll.directive.js | 32 -------------------
.../templates/sites-list/sites-list.html | 3 +-
3 files changed, 1 insertion(+), 35 deletions(-)
delete mode 100644 plugins/SitesManager/angularjs/sites-manager/scroll.directive.js
diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php
index 8d7da85bfb..3fba9cc9bd 100644
--- a/plugins/SitesManager/SitesManager.php
+++ b/plugins/SitesManager/SitesManager.php
@@ -91,7 +91,6 @@ class SitesManager extends \Piwik\Plugin
$jsFiles[] = "plugins/SitesManager/angularjs/sites-manager/sites-manager-admin-sites-model.js";
$jsFiles[] = "plugins/SitesManager/angularjs/sites-manager/multiline-field.directive.js";
$jsFiles[] = "plugins/SitesManager/angularjs/sites-manager/edit-trigger.directive.js";
- $jsFiles[] = "plugins/SitesManager/angularjs/sites-manager/scroll.directive.js";
$jsFiles[] = "plugins/SitesManager/angularjs/sites-manager/sites-manager.controller.js";
$jsFiles[] = "plugins/SitesManager/angularjs/sites-manager/sites-manager-site.controller.js";
}
diff --git a/plugins/SitesManager/angularjs/sites-manager/scroll.directive.js b/plugins/SitesManager/angularjs/sites-manager/scroll.directive.js
deleted file mode 100644
index 89f6e9c66d..0000000000
--- a/plugins/SitesManager/angularjs/sites-manager/scroll.directive.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/*!
- * Piwik - free/libre analytics platform
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-(function () {
- angular.module('piwikApp').directive('sitesManagerScroll', sitesManagerScroll);
-
- sitesManagerScroll.$inject = ['piwik'];
-
- function sitesManagerScroll (piwik) {
-
- return {
- restrict: 'A',
- link: function (scope, element) {
-
- function scrollToSite () {
- piwik.helper.lazyScrollTo(element[0], 500, true);
- }
-
- scope.$watch('site.editMode', function() {
-
- if(scope.site.editMode)
- scrollToSite();
- });
-
- }
- };
- }
-
-})();
diff --git a/plugins/SitesManager/templates/sites-list/sites-list.html b/plugins/SitesManager/templates/sites-list/sites-list.html
index e408f2a495..15e2b9bc9b 100644
--- a/plugins/SitesManager/templates/sites-list/sites-list.html
+++ b/plugins/SitesManager/templates/sites-list/sites-list.html
@@ -27,8 +27,7 @@
{{ 'SitesManager_NotFound'|translate }} <strong>{{ adminSites.searchTerm }}</strong>
</td>
</tr>
- <tr sites-manager-scroll
- ng-controller="SitesManagerSiteController"
+ <tr ng-controller="SitesManagerSiteController"
ng-repeat="site in adminSites.sites"
ng-include="'plugins/SitesManager/templates/sites-list/site-fields.html?cb=' + cacheBuster">
</tr>
--
GitLab