Skip to content

Commit

Permalink
refactor(theme): remove skin related files
Browse files Browse the repository at this point in the history
  • Loading branch information
KostyaDanovsky committed May 13, 2016
1 parent 43e50fc commit cd8666a
Show file tree
Hide file tree
Showing 25 changed files with 128 additions and 440 deletions.
3 changes: 1 addition & 2 deletions src/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,5 @@ angular.module('BlurAdmin', [
'angular-progress-button-styles',

'BlurAdmin.theme',
'BlurAdmin.pages',
'BlurAdmin.tplSkin'
'BlurAdmin.pages'
]);
4 changes: 1 addition & 3 deletions src/app/pages/charts/amCharts/areaChart/AreaChartCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.controller('AreaChartCtrl', AreaChartCtrl);

/** @ngInject */
function AreaChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper, layoutPaths) {
function AreaChartCtrl($scope, layoutColors, $element, layoutPaths) {
var id = $element[0].getAttribute('id');
var areaChart = AmCharts.makeChart(id, {
type: 'serial',
Expand Down Expand Up @@ -136,8 +136,6 @@
pathToImages: layoutPaths.images.amChart
});

//tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, areaChart);

areaChart.addListener('dataUpdated', zoomAreaChart);

function zoomAreaChart() {
Expand Down
4 changes: 1 addition & 3 deletions src/app/pages/charts/amCharts/barChart/BarChartCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.controller('BarChartCtrl', BarChartCtrl);

/** @ngInject */
function BarChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper, layoutPaths) {
function BarChartCtrl($scope, layoutColors, $element, layoutPaths) {
var id = $element[0].getAttribute('id');
var barChart = AmCharts.makeChart(id, {
type: 'serial',
Expand Down Expand Up @@ -86,7 +86,5 @@
creditsPosition: 'top-right',
pathToImages: layoutPaths.images.amChart
});

//tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, barChart);
}
})();
5 changes: 1 addition & 4 deletions src/app/pages/charts/amCharts/funnelChart/FunnelChartCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.controller('FunnelChartCtrl', FunnelChartCtrl);

/** @ngInject */
function FunnelChartCtrl($scope, $element, tplSkinChartWatcherHelper, layoutPaths, layoutColors) {
function FunnelChartCtrl($scope, $element, layoutPaths, layoutColors) {
var id = $element[0].getAttribute('id');
var funnelChart = AmCharts.makeChart(id, {
type: 'funnel',
Expand Down Expand Up @@ -65,8 +65,5 @@
creditsPosition: 'bottom-left',
pathToImages: layoutPaths
});

//tplSkinChartWatcherHelper.watchFunnelChanges($scope, funnelChart);
}

})();
4 changes: 1 addition & 3 deletions src/app/pages/charts/amCharts/lineChart/LineChartCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.controller('LineChartCtrl', LineChartCtrl);

/** @ngInject */
function LineChartCtrl($scope, layoutColors, $element, tplSkinChartWatcherHelper, layoutPaths) {
function LineChartCtrl($scope, layoutColors, $element, layoutPaths) {
var id = $element[0].getAttribute('id');
var lineChart = AmCharts.makeChart(id, {
type: 'serial',
Expand Down Expand Up @@ -144,8 +144,6 @@
pathToImages: layoutPaths.images.amChart
});

//tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, lineChart);

lineChart.addListener('rendered', zoomChart);
if (lineChart.zoomChart) {
lineChart.zoomChart();
Expand Down
4 changes: 1 addition & 3 deletions src/app/pages/charts/amCharts/pieChart/PieChartCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.controller('PieChartCtrl', PieChartCtrl);

/** @ngInject */
function PieChartCtrl($scope, $element, tplSkinChartWatcherHelper, layoutPaths, layoutColors) {
function PieChartCtrl($element, layoutPaths, layoutColors) {
var id = $element[0].getAttribute('id');
var pieChart = AmCharts.makeChart(id, {
type: 'pie',
Expand Down Expand Up @@ -128,8 +128,6 @@
}
});

//tplSkinChartWatcherHelper.watchDonutChanges($scope, pieChart);

pieChart.addListener('init', handleInit);

pieChart.addListener('rollOverSlice', function (e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.controller('DashboardLineChartCtrl', DashboardLineChartCtrl);

/** @ngInject */
function DashboardLineChartCtrl($scope, tplSkinManager, tplSkinChartWatcherHelper, layoutColors, layoutPaths) {
function DashboardLineChartCtrl(layoutColors, layoutPaths) {
var chartData = [
{ date: new Date(2012, 11), value: 0, value0: 0 },
{ date: new Date(2013, 0), value: 15000, value0: 19000},
Expand Down Expand Up @@ -43,8 +43,6 @@
{ date: new Date(2015, 1), value: 49800, value0: 13000}
];

//var chartColorProfile = tplSkinManager.getChartColorProfile();

var chart = AmCharts.makeChart('amchart', {
type: 'serial',
theme: 'blur',
Expand Down Expand Up @@ -114,8 +112,6 @@
pathToImages: layoutPaths.images.amChart
});

//tplSkinChartWatcherHelper.watchAxisChartStyleChanges($scope, chart);

function zoomChart() {
chart.zoomToDates(new Date(2013, 3), new Date(2014, 0));
}
Expand Down
9 changes: 1 addition & 8 deletions src/app/theme/components/baPanel/baPanel.directive.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,8 @@
.directive('baPanel', baPanel);

/** @ngInject */
function baPanel(baPanel, $document, $window, tplSkinManager) {
function baPanel(baPanel) {
return angular.extend({}, baPanel, {
link: function($scope){
$scope.panelType = tplSkinManager.getActiveSkin().panelType;
$scope.$on('tplSkinChanged', function(){
$scope.panelType = tplSkinManager.getActiveSkin().panelType;
});
},
template: function(el, attrs) {
var res = '<div class="panel {{panelType}} full-invisible ' + (attrs.baPanelClass || '') + '" zoom-in ba-panel-blur>';
res += baPanel.template(el, attrs);
Expand All @@ -28,5 +22,4 @@
}
});
}

})();
71 changes: 0 additions & 71 deletions src/app/tplSkin/tplSkin.constants.js

This file was deleted.

14 changes: 0 additions & 14 deletions src/app/tplSkin/tplSkin.module.js

This file was deleted.

67 changes: 0 additions & 67 deletions src/app/tplSkin/tplSkinChartWatcherHelper.service.js

This file was deleted.

50 changes: 0 additions & 50 deletions src/app/tplSkin/tplSkinManager.service.js

This file was deleted.

25 changes: 0 additions & 25 deletions src/app/tplSkin/tplSkinPanel.directive.js

This file was deleted.

10 changes: 0 additions & 10 deletions src/app/tplSkin/tplSkinPanel.html

This file was deleted.

Loading

0 comments on commit cd8666a

Please sign in to comment.