chore(dept): update dependencies, angular to rc2

This commit is contained in:
nixa 2016-06-21 12:24:19 +03:00
parent 70f3dc8dbf
commit 2b7d7ef3e6
13 changed files with 50 additions and 69 deletions

View file

@ -1,7 +1,7 @@
import {Component, ViewEncapsulation} from '@angular/core';
import {BaFullCalendar} from '../../../theme/components';
import {CalendarService} from "./calendar.service";
import {CalendarService} from './calendar.service';
@Component({
selector: 'calendar',
@ -36,9 +36,9 @@ export class Calendar {
start: start,
end: end
};
$(this._calendar).fullCalendar('renderEvent', eventData, true);
jQuery(this._calendar).fullCalendar('renderEvent', eventData, true);
}
$(this._calendar).fullCalendar('unselect');
jQuery(this._calendar).fullCalendar('unselect');
}
}
}

View file

@ -33,14 +33,14 @@ export class PieChart {
private _loadPieCharts() {
$('.chart').each(function () {
let chart = $(this);
jQuery('.chart').each(function () {
let chart = jQuery(this);
chart.easyPieChart({
easing: 'easeOutBounce',
onStep: function (from, to, percent) {
$(this.el).find('.percent').text(Math.round(percent));
jQuery(this.el).find('.percent').text(Math.round(percent));
},
barColor: $(this).attr('data-rel'),
barColor: jQuery(this).attr('data-rel'),
trackColor: 'rgba(0,0,0,0)',
size: 84,
scaleLength: 0,
@ -54,8 +54,8 @@ export class PieChart {
private _updatePieCharts() {
let getRandomArbitrary = (min, max) => { return Math.random() * (max - min) + min };
$('.pie-charts .chart').each(function(index, chart) {
$(chart).data('easyPieChart').update(getRandomArbitrary(55, 90));
jQuery('.pie-charts .chart').each(function(index, chart) {
jQuery(chart).data('easyPieChart').update(getRandomArbitrary(55, 90));
});
}
}

View file

@ -25,7 +25,7 @@ export class TrafficChart {
}
private _loadDoughnutCharts() {
let el = $('.chart-area').get(0);
let el = jQuery('.chart-area').get(0);
new Chart(el.getContext('2d')).Doughnut(this.doughnutData, {
segmentShowStroke: false,
percentageInnerCutout : 64,