From 0f7dae7b78639c4e67575986e666ba3e5e40ceec Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@googlemail.com>
Date: Mon, 17 Feb 2014 01:03:32 +0100
Subject: [PATCH] applied some more best practice recommendations for angular
that were published a few days ago, see
https://docs.google.com/document/d/1XXMvReO8-Awi1EZXAXS4PzDzdNvV6pGcuaF4Q9821Es/pub
---
plugins/CoreHome/CoreHome.php | 26 +++++++++----------
...d.js => autocomplete-matched-directive.js} | 0
.../{directives.js => directive.js} | 0
...s => focus-anywhere-but-here-directive.js} | 0
...noreClick.js => ignore-click-directive.js} | 0
.../filters/{filters.js => filter.js} | 0
.../{htmldecode.js => htmldecode-filter.js} | 0
.../{translate.js => translate-filter.js} | 0
.../{PiwikApi.js => piwik-api-service.js} | 0
.../services/{piwik.js => piwik-service.js} | 0
.../services/{services.js => service.js} | 0
...ntroller.js => siteselector-controller.js} | 0
...sts.js => siteselector-controller_test.js} | 2 +-
...irectives.js => siteselector-directive.js} | 2 +-
...SelectorModel.js => siteselector-model.js} | 0
...SelectorPartial.html => siteselector.html} | 0
16 files changed, 15 insertions(+), 15 deletions(-)
rename plugins/CoreHome/javascripts/directives/{autocompleteMatched.js => autocomplete-matched-directive.js} (100%)
rename plugins/CoreHome/javascripts/directives/{directives.js => directive.js} (100%)
rename plugins/CoreHome/javascripts/directives/{focusAnywhereButHere.js => focus-anywhere-but-here-directive.js} (100%)
rename plugins/CoreHome/javascripts/directives/{ignoreClick.js => ignore-click-directive.js} (100%)
rename plugins/CoreHome/javascripts/filters/{filters.js => filter.js} (100%)
rename plugins/CoreHome/javascripts/filters/{htmldecode.js => htmldecode-filter.js} (100%)
rename plugins/CoreHome/javascripts/filters/{translate.js => translate-filter.js} (100%)
rename plugins/CoreHome/javascripts/services/{PiwikApi.js => piwik-api-service.js} (100%)
rename plugins/CoreHome/javascripts/services/{piwik.js => piwik-service.js} (100%)
rename plugins/CoreHome/javascripts/services/{services.js => service.js} (100%)
rename plugins/CoreHome/javascripts/siteselector/{siteSelectorController.js => siteselector-controller.js} (100%)
rename plugins/CoreHome/javascripts/siteselector/{tests.js => siteselector-controller_test.js} (85%)
rename plugins/CoreHome/javascripts/siteselector/{siteSelectorDirectives.js => siteselector-directive.js} (98%)
rename plugins/CoreHome/javascripts/siteselector/{siteSelectorModel.js => siteselector-model.js} (100%)
rename plugins/CoreHome/javascripts/siteselector/{siteSelectorPartial.html => siteselector.html} (100%)
diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
index 6a627d3622..3413642a1f 100644
--- a/plugins/CoreHome/CoreHome.php
+++ b/plugins/CoreHome/CoreHome.php
@@ -93,24 +93,24 @@ class CoreHome extends \Piwik\Plugin
$jsFiles[] = "plugins/CoreHome/javascripts/piwikAppConfig.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/services/services.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/services/piwik.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/services/piwikApi.js";
+ $jsFiles[] = "plugins/CoreHome/javascripts/services/service.js";
+ $jsFiles[] = "plugins/CoreHome/javascripts/services/piwik-service.js";
+ $jsFiles[] = "plugins/CoreHome/javascripts/services/piwik-api-service.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/filters/filters.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/filters/htmldecode.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/filters/translate.js";
+ $jsFiles[] = "plugins/CoreHome/javascripts/filters/filter.js";
+ $jsFiles[] = "plugins/CoreHome/javascripts/filters/htmldecode-filter.js";
+ $jsFiles[] = "plugins/CoreHome/javascripts/filters/translate-filter.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/directives/directives.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/directives/autocompleteMatched.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/directives/focusAnywhereButHere.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/directives/ignoreClick.js";
+ $jsFiles[] = "plugins/CoreHome/javascripts/directives/directive.js";
+ $jsFiles[] = "plugins/CoreHome/javascripts/directives/autocomplete-matched-directive.js";
+ $jsFiles[] = "plugins/CoreHome/javascripts/directives/focus-anywhere-but-here-directive.js";
+ $jsFiles[] = "plugins/CoreHome/javascripts/directives/ignore-click-directive.js";
$jsFiles[] = "plugins/CoreHome/javascripts/piwikApp.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/siteselector/siteSelectorModel.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/siteselector/siteSelectorController.js";
- $jsFiles[] = "plugins/CoreHome/javascripts/siteselector/siteSelectorDirectives.js";
+ $jsFiles[] = "plugins/CoreHome/javascripts/siteselector/siteselector-model.js";
+ $jsFiles[] = "plugins/CoreHome/javascripts/siteselector/siteselector-controller.js";
+ $jsFiles[] = "plugins/CoreHome/javascripts/siteselector/siteselector-directive.js";
}
public function getClientSideTranslationKeys(&$translationKeys)
diff --git a/plugins/CoreHome/javascripts/directives/autocompleteMatched.js b/plugins/CoreHome/javascripts/directives/autocomplete-matched-directive.js
similarity index 100%
rename from plugins/CoreHome/javascripts/directives/autocompleteMatched.js
rename to plugins/CoreHome/javascripts/directives/autocomplete-matched-directive.js
diff --git a/plugins/CoreHome/javascripts/directives/directives.js b/plugins/CoreHome/javascripts/directives/directive.js
similarity index 100%
rename from plugins/CoreHome/javascripts/directives/directives.js
rename to plugins/CoreHome/javascripts/directives/directive.js
diff --git a/plugins/CoreHome/javascripts/directives/focusAnywhereButHere.js b/plugins/CoreHome/javascripts/directives/focus-anywhere-but-here-directive.js
similarity index 100%
rename from plugins/CoreHome/javascripts/directives/focusAnywhereButHere.js
rename to plugins/CoreHome/javascripts/directives/focus-anywhere-but-here-directive.js
diff --git a/plugins/CoreHome/javascripts/directives/ignoreClick.js b/plugins/CoreHome/javascripts/directives/ignore-click-directive.js
similarity index 100%
rename from plugins/CoreHome/javascripts/directives/ignoreClick.js
rename to plugins/CoreHome/javascripts/directives/ignore-click-directive.js
diff --git a/plugins/CoreHome/javascripts/filters/filters.js b/plugins/CoreHome/javascripts/filters/filter.js
similarity index 100%
rename from plugins/CoreHome/javascripts/filters/filters.js
rename to plugins/CoreHome/javascripts/filters/filter.js
diff --git a/plugins/CoreHome/javascripts/filters/htmldecode.js b/plugins/CoreHome/javascripts/filters/htmldecode-filter.js
similarity index 100%
rename from plugins/CoreHome/javascripts/filters/htmldecode.js
rename to plugins/CoreHome/javascripts/filters/htmldecode-filter.js
diff --git a/plugins/CoreHome/javascripts/filters/translate.js b/plugins/CoreHome/javascripts/filters/translate-filter.js
similarity index 100%
rename from plugins/CoreHome/javascripts/filters/translate.js
rename to plugins/CoreHome/javascripts/filters/translate-filter.js
diff --git a/plugins/CoreHome/javascripts/services/PiwikApi.js b/plugins/CoreHome/javascripts/services/piwik-api-service.js
similarity index 100%
rename from plugins/CoreHome/javascripts/services/PiwikApi.js
rename to plugins/CoreHome/javascripts/services/piwik-api-service.js
diff --git a/plugins/CoreHome/javascripts/services/piwik.js b/plugins/CoreHome/javascripts/services/piwik-service.js
similarity index 100%
rename from plugins/CoreHome/javascripts/services/piwik.js
rename to plugins/CoreHome/javascripts/services/piwik-service.js
diff --git a/plugins/CoreHome/javascripts/services/services.js b/plugins/CoreHome/javascripts/services/service.js
similarity index 100%
rename from plugins/CoreHome/javascripts/services/services.js
rename to plugins/CoreHome/javascripts/services/service.js
diff --git a/plugins/CoreHome/javascripts/siteselector/siteSelectorController.js b/plugins/CoreHome/javascripts/siteselector/siteselector-controller.js
similarity index 100%
rename from plugins/CoreHome/javascripts/siteselector/siteSelectorController.js
rename to plugins/CoreHome/javascripts/siteselector/siteselector-controller.js
diff --git a/plugins/CoreHome/javascripts/siteselector/tests.js b/plugins/CoreHome/javascripts/siteselector/siteselector-controller_test.js
similarity index 85%
rename from plugins/CoreHome/javascripts/siteselector/tests.js
rename to plugins/CoreHome/javascripts/siteselector/siteselector-controller_test.js
index 92b3089007..0389824a28 100644
--- a/plugins/CoreHome/javascripts/siteselector/tests.js
+++ b/plugins/CoreHome/javascripts/siteselector/siteselector-controller_test.js
@@ -5,7 +5,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-describe('SiteSelector Tests', function() {
+describe('SiteSelectorController Tests', function() {
beforeEach(module(function() {
return function(inject1, inject2) {
}
diff --git a/plugins/CoreHome/javascripts/siteselector/siteSelectorDirectives.js b/plugins/CoreHome/javascripts/siteselector/siteselector-directive.js
similarity index 98%
rename from plugins/CoreHome/javascripts/siteselector/siteSelectorDirectives.js
rename to plugins/CoreHome/javascripts/siteselector/siteselector-directive.js
index 091fee47ef..023f4bcc31 100644
--- a/plugins/CoreHome/javascripts/siteselector/siteSelectorDirectives.js
+++ b/plugins/CoreHome/javascripts/siteselector/siteselector-directive.js
@@ -27,7 +27,7 @@ angular.module('piwikApp').directive('piwikSiteSelector', function($document, pi
allSitesText: '@',
allSitesLocation: '@'
},
- templateUrl: 'plugins/CoreHome/javascripts/siteselector/siteSelectorPartial.html',
+ templateUrl: 'plugins/CoreHome/javascripts/siteselector/siteselector.html',
controller: 'SiteSelectorController',
compile: function (element, attrs) {
element.addClass('sites_autocomplete');
diff --git a/plugins/CoreHome/javascripts/siteselector/siteSelectorModel.js b/plugins/CoreHome/javascripts/siteselector/siteselector-model.js
similarity index 100%
rename from plugins/CoreHome/javascripts/siteselector/siteSelectorModel.js
rename to plugins/CoreHome/javascripts/siteselector/siteselector-model.js
diff --git a/plugins/CoreHome/javascripts/siteselector/siteSelectorPartial.html b/plugins/CoreHome/javascripts/siteselector/siteselector.html
similarity index 100%
rename from plugins/CoreHome/javascripts/siteselector/siteSelectorPartial.html
rename to plugins/CoreHome/javascripts/siteselector/siteselector.html
--
GitLab