Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2025-12-16 23:40:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(dept): update dependencies, angular to rc2

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

36
package.json
View file

@ -6,15 +6,15 @@
"homepage": "http://akveo.github.io/ng2-admin/",
"license": "MIT",
"dependencies": {
"@angular/common": "2.0.0-rc.1",
"@angular/compiler": "2.0.0-rc.1",
"@angular/core": "2.0.0-rc.1",
"@angular/http": "2.0.0-rc.1",
"@angular/platform-browser": "2.0.0-rc.1",
"@angular/platform-browser-dynamic": "2.0.0-rc.1",
"@angular/platform-server": "2.0.0-rc.1",
"@angular/router": "2.0.0-rc.1",
"@angular/router-deprecated": "2.0.0-rc.1",
"@angular/common": "2.0.0-rc.2",
"@angular/compiler": "2.0.0-rc.2",
"@angular/core": "2.0.0-rc.2",
"@angular/http": "2.0.0-rc.2",
"@angular/platform-browser": "2.0.0-rc.2",
"@angular/platform-browser-dynamic": "2.0.0-rc.2",
"@angular/platform-server": "2.0.0-rc.2",
"@angular/router": "2.0.0-rc.2",
"@angular/router-deprecated": "2.0.0-rc.2",
"amcharts3": "github:amcharts/amcharts3",
"ammap3": "github:amcharts/ammap3",
"animate.css": "^3.5.1",
@ -22,7 +22,7 @@
"bootstrap-loader": "^1.0.8",
"chart.js": "^1.1.1",
"chartist": "^0.9.7",
"core-js": "^2.2.2",
"core-js": "^2.4.0",
"easy-pie-chart": "^2.1.7",
"extract-text-webpack-plugin": "^1.0.1",
"font-awesome": "^4.6.1",
@ -41,11 +41,11 @@
"zone.js": "~0.6.12"
},
"devDependencies": {
"angular2-hmr": "~0.6.0",
"awesome-typescript-loader": "~0.17.0",
"angular2-hmr": "~0.7.0",
"awesome-typescript-loader": "^1.0.0",
"codelyzer": "~0.0.19",
"compression-webpack-plugin": "^0.3.1",
"copy-webpack-plugin": "^2.1.3",
"copy-webpack-plugin": "^3.0.1",
"css-loader": "^0.23.1",
"es6-promise": "^3.1.2",
"es6-promise-loader": "^1.0.1",
@ -68,17 +68,17 @@
"source-map-loader": "^0.1.5",
"style-loader": "^0.13.1",
"ts-helpers": "1.1.1",
"ts-node": "^0.7.1",
"ts-node": "^0.9.0",
"tslint": "^3.7.1",
"tslint-loader": "^2.1.3",
"typedoc": "^0.3.12",
"typedoc": "^0.4.2",
"typescript": "~1.8.9",
"typings": "^0.8.1",
"typings": "^1.0.5",
"url-loader": "^0.5.7",
"webpack": "^1.12.14",
"webpack": "^1.13.1",
"webpack-dev-server": "^1.14.1",
"webpack-md5-hash": "^0.0.5",
"webpack-merge": "^0.12.0"
"webpack-merge": "^0.14.0"
},
"scripts": {
"rimraf": "rimraf",

6
src/app/pages/dashboard/calendar/calendar.component.ts
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');
}
}
}

12
src/app/pages/dashboard/pieChart/pieChart.component.ts
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));
});
}
}

2
src/app/pages/dashboard/trafficChart/trafficChart.component.ts
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,

4
src/app/theme/components/baBackTop/baBackTop.component.ts
View file

@ -21,13 +21,13 @@ export class BaBackTop {
@HostListener('click')
_onClick():boolean {
$('html, body').animate({scrollTop:0}, {duration:this.moveSpeed});
jQuery('html, body').animate({scrollTop:0}, {duration:this.moveSpeed});
return false;
}
@HostListener('window:scroll')
_onWindowScroll():void {
let el = this._selector.nativeElement;
window.scrollY > this.position ? $(el).fadeIn(this.showSpeed) : $(el).fadeOut(this.showSpeed);
window.scrollY > this.position ? jQuery(el).fadeIn(this.showSpeed) : jQuery(el).fadeOut(this.showSpeed);
}
}

2
src/app/theme/components/baFullCalendar/baFullCalendar.component.ts
View file

@ -16,7 +16,7 @@ export class BaFullCalendar {
@ViewChild('baFullCalendar') private _selector:ElementRef;
ngAfterViewInit() {
let calendar = $(this._selector.nativeElement).fullCalendar(this.baFullCalendarConfiguration);
let calendar = jQuery(this._selector.nativeElement).fullCalendar(this.baFullCalendarConfiguration);
this.onCalendarReady.emit(calendar);
}
}

2
src/app/theme/components/baSidebar/baSidebar.component.ts
View file

@ -94,7 +94,7 @@ export class BaSidebar {
}
public toggleSubMenu($event, item):boolean {
var submenu = $($event.currentTarget).next();
var submenu = jQuery($event.currentTarget).next();
if (this.isMenuCollapsed) {
this.menuExpand();

4
src/app/theme/directives/baSlimScroll/baSlimScroll.directive.ts
View file

@ -22,10 +22,10 @@ export class BaSlimScroll {
}
private _init() {
$(this._elementRef.nativeElement).slimScroll(this.baSlimScrollOptions);
jQuery(this._elementRef.nativeElement).slimScroll(this.baSlimScrollOptions);
}
private _destroy() {
$(this._elementRef.nativeElement).slimScroll({ destroy: true });
jQuery(this._elementRef.nativeElement).slimScroll({ destroy: true });
}
}

1
src/app/theme/theme.configProvider.ts
View file

@ -1,5 +1,6 @@
import {Injectable} from '@angular/core';
import {colorHelper} from './theme.constants';
import * as _ from 'lodash';
@Injectable()
export class BaThemeConfigProvider {

2
src/custom-typings.d.ts vendored
View file

@ -29,7 +29,7 @@ import * as _ from 'lodash'
*
*/
declare var $:any;
declare var jQuery:any;
declare var GoogleMapsLoader:any;
declare var L:any;
declare var AmCharts:any;

12
tsconfig.json
View file

@ -8,19 +8,9 @@
"noEmitHelpers": true
},
"exclude": [
"node_modules",
"typings/main.d.ts",
"typings/main"
],
"filesGlob": [
"./src/**/*.ts",
"./test/**/*.ts",
"!./node_modules/**/*.ts",
"src/custom-typings.d.ts",
"typings/browser.d.ts"
"node_modules"
],
"awesomeTypescriptLoaderOptions": {
"resolveGlobs": true,
"forkChecker": true
},
"compileOnSave": false,

17
tslint.json
View file

@ -1,6 +1,6 @@
{
"rulesDirectory": [
"node_modules/codelyzer/dist/src"
"node_modules/codelyzer"
],
"rules": {
"member-access": false,
@ -133,19 +133,6 @@
"check-separator",
"check-type"
],
"directive-selector-name": [true, "kebab-case"],
"component-selector-name": [true, "kebab-case"],
"directive-selector-type": [true, "attribute"],
"component-selector-type": [true, "element"],
"directive-selector-prefix": false,
"component-selector-prefix": false,
"host-parameter-decorator": true,
"input-parameter-decorator": true,
"output-parameter-decorator": true,
"attribute-parameter-decorator": false,
"input-property-directive": true,
"output-property-directive": true,
"call-forward-ref":true
"import-destructuring-spacing": true
}
}

19
typings.json
View file

@ -1,13 +1,16 @@
{
"dependencies": {
"zone.js": "github:gdi2290/typed-zone.js#66ea8a3451542bb7798369306840e46be1d6ec89"
},
"devDependencies": {},
"globalDependencies": {
"angular-protractor": "registry:dt/angular-protractor#1.5.0+20160425143459",
"core-js": "registry:dt/core-js#0.0.0+20160317120654",
"hammerjs": "github:DefinitelyTyped/DefinitelyTyped/hammerjs/hammerjs.d.ts#74a4dfc1bc2dfadec47b8aae953b28546cb9c6b7",
"lodash": "registry:dt/lodash#3.10.0+20160330154726",
"node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#8cf8164641be73e8f1e652c2a5b967c7210b6729",
"webpack": "github:DefinitelyTyped/DefinitelyTyped/webpack/webpack.d.ts#95c02169ba8fa58ac1092422efbd2e3174a206f4"
"hammerjs": "registry:dt/hammerjs#2.0.4+20160417130828",
"jasmine": "registry:dt/jasmine#2.2.0+20160505161446",
"node": "registry:dt/node#6.0.0+20160514165920",
"selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654",
"source-map": "registry:dt/source-map#0.0.0+20160317120654",
"uglify-js": "registry:dt/uglify-js#2.6.1+20160316155526",
"webpack": "registry:dt/webpack#1.12.9+20160321060707"
},
"dependencies": {
"lodash": "registry:npm/lodash#4.0.0+20160416211519"
}
}