Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@googlemail.com>2014-03-31 04:57:17 +0400
committerThomas Steur <thomas.steur@googlemail.com>2014-03-31 04:57:17 +0400
commit3a4b705e1e8b9a70aed4f649344057ee03c679a4 (patch)
treece0a284563dd186654a789df5bb6692bc24eb1af /plugins/MultiSites
parentcd043e682d6b4ddf58b44a25ed983e2ee690362d (diff)
refs #4619 run jshint when saving a file or running tests but only for actual angular files
Diffstat (limited to 'plugins/MultiSites')
-rw-r--r--plugins/MultiSites/angularjs/dashboard/dashboard-controller.js2
-rw-r--r--plugins/MultiSites/angularjs/dashboard/dashboard-directive.js2
-rw-r--r--plugins/MultiSites/angularjs/dashboard/dashboard-filter.js2
-rw-r--r--plugins/MultiSites/angularjs/dashboard/dashboard-model.js10
-rw-r--r--plugins/MultiSites/angularjs/site/site-directive.js4
5 files changed, 10 insertions, 10 deletions
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard-controller.js b/plugins/MultiSites/angularjs/dashboard/dashboard-controller.js
index aa93c28be2..470ab41359 100644
--- a/plugins/MultiSites/angularjs/dashboard/dashboard-controller.js
+++ b/plugins/MultiSites/angularjs/dashboard/dashboard-controller.js
@@ -30,5 +30,5 @@ angular.module('piwikApp').controller('MultiSitesDashboardController', function(
this.refresh = function (interval) {
multisitesDashboardModel.fetchAllSites(interval);
- }
+ };
});
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard-directive.js b/plugins/MultiSites/angularjs/dashboard/dashboard-directive.js
index 5a8da8170d..0576c93474 100644
--- a/plugins/MultiSites/angularjs/dashboard/dashboard-directive.js
+++ b/plugins/MultiSites/angularjs/dashboard/dashboard-directive.js
@@ -36,5 +36,5 @@ angular.module('piwikApp').directive('piwikMultisitesDashboard', function($docum
controller.refresh(attrs.autoRefreshTodayReport);
}
- }
+ };
}); \ No newline at end of file
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard-filter.js b/plugins/MultiSites/angularjs/dashboard/dashboard-filter.js
index c9df1c23bd..b989415dae 100644
--- a/plugins/MultiSites/angularjs/dashboard/dashboard-filter.js
+++ b/plugins/MultiSites/angularjs/dashboard/dashboard-filter.js
@@ -58,6 +58,6 @@ angular.module('piwikApp').filter('multiSitesGroupFilter', function() {
}
return filteredSites;
- }
+ };
});
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard-model.js b/plugins/MultiSites/angularjs/dashboard/dashboard-model.js
index 08ef06f843..edba4e478d 100644
--- a/plugins/MultiSites/angularjs/dashboard/dashboard-model.js
+++ b/plugins/MultiSites/angularjs/dashboard/dashboard-model.js
@@ -46,7 +46,7 @@ angular.module('piwikApp').factory('multisitesDashboardModel', function (piwikAp
nb_pageviews: 0,
revenue: 0,
isGroup: true
- }
+ };
}
// create a new group with empty site to make sure we do not change the original group in $allSites
@@ -59,7 +59,7 @@ angular.module('piwikApp').factory('multisitesDashboardModel', function (piwikAp
nb_pageviews: group.nb_pageviews,
revenue: group.revenue,
isGroup: true
- }
+ };
}
function onError () {
@@ -231,13 +231,13 @@ angular.module('piwikApp').factory('multisitesDashboardModel', function (piwikAp
showColumns: 'label,nb_visits',
enhanced: 1,
date: lastDate
- })
+ });
}).then(function (response) {
if (response && response.reportTotal) {
model.lastVisits = response.reportTotal.nb_visits;
}
});
- };
+ }
model.fetchAllSites = function (refreshInterval) {
@@ -263,7 +263,7 @@ angular.module('piwikApp').factory('multisitesDashboardModel', function (piwikAp
if (refreshInterval && refreshInterval > 0) {
$timeout(function () {
- model.fetchAllSites(refreshInterval)
+ model.fetchAllSites(refreshInterval);
}, refreshInterval * 1000);
}
});
diff --git a/plugins/MultiSites/angularjs/site/site-directive.js b/plugins/MultiSites/angularjs/site/site-directive.js
index 7cda35482e..7cbaff5479 100644
--- a/plugins/MultiSites/angularjs/site/site-directive.js
+++ b/plugins/MultiSites/angularjs/site/site-directive.js
@@ -49,7 +49,7 @@ angular.module('piwikApp').directive('piwikMultisitesSite', function($document,
}
return piwik.piwik_url + '?module=MultiSites&action=getEvolutionGraph&period=' + $scope.period + '&date=' + $scope.dateSparkline + '&evolutionBy=' +$scope.metric + '&columns=' + $scope.metric + '&idSite=' + website.idsite + '&idsite=' + website.idsite + '&viewDataTable=sparkline' + append + '&colors=' + encodeURIComponent(JSON.stringify(piwik.getSparklineColors()));
- }
+ };
}
- }
+ };
}); \ No newline at end of file