Commit f50532aa authored by Dmitriy Shekhovtsov's avatar Dmitriy Shekhovtsov
Browse files

Version bump: buttons done

parent 0915292c
Showing with 40 additions and 20 deletions
+40 -20
......@@ -13,7 +13,7 @@ all components will have same API
- [ ] Accordion
- [x] Alert
- [ ] Buttons
- [x] Buttons
- [ ] Carousel
- [ ] Collapse
- [ ] Datepicker
......
{
"name": "ng2-bootstrap",
"version": "0.34.1",
"version": "0.34.2",
"description": "angular2 bootstrap components",
"main": "index.js",
"scripts": {
"deploy": "NODE_ENV=production webpack -p --progress --color --optimize-minimize --optimize-dedupe --optimize-occurence-order",
"postinstall": "tsd reinstall --overwrite",
"prestart": "npm install",
"server": "webpack-dev-server --hot --inline --colors --display-error-details --display-cached",
......@@ -32,6 +33,7 @@
"awesome-typescript-loader": "^0.11.3",
"babel-eslint": "^4.0.5",
"bootstrap": "^3.3.5",
"compression-webpack-plugin": "^0.2.0",
"eslint": "^1.1.0",
"gulp": "^3.9.0",
"gulp-eslint": "^1.0.0",
......
......@@ -29,7 +29,6 @@ export class ButtonRadio extends DefaultValueAccessor {
constructor(@Self() cd:NgModel, renderer:Renderer, elementRef:ElementRef) {
super(cd, renderer, elementRef);
this.uncheckable = elementRef.nativeElement.getAttribute('uncheckable') != null;
console.log(this.uncheckable);
}
......
/// <reference path="../../../typings/tsd.d.ts" />
// todo: add pipe for checkResults | get values
import {Component, View, bootstrap} from 'angular2/angular2';
import {coreDirectives, formDirectives} from 'angular2/angular2';
......@@ -22,7 +22,7 @@ import {ButtonRadio} from 'src/components/buttons/button-radio';
</button>
<h4>Checkbox</h4>
<pre>Model: {{checkModel | json}}</pre>
<pre>Results: {{checkResults}}</pre>
<!--<pre>Results: {{checkResults}}</pre>-->
<div class="btn-group">
<label class="btn btn-primary" [(ng-model)]="checkModel.left" btn-checkbox>Left</label>
<label class="btn btn-primary" [(ng-model)]="checkModel.middle" btn-checkbox>Middle</label>
......
......@@ -10,8 +10,8 @@ import {ButtonsDemo} from 'src/components/demo/buttonts-demo';
})
@View({
template: `
<buttons-demo></buttons-demo>
<!--<alert-demo></alert-demo>-->
<alert-demo></alert-demo>
<buttons-demo></buttons-demo>
`,
directives: [AlertDemo, ButtonsDemo, coreDirectives]
})
......
var webpack = require('webpack');
var path = require('path');
/*eslint no-process-env:0*/
var isProduction = process.env.NODE_ENV || 'development';
var CompressionPlugin = require('compression-webpack-plugin');
/*eslint no-process-env:0, camelcase:0*/
var isProduction = (process.env.NODE_ENV || 'development') === 'production';
var src = 'src/public';
//var absSrc = path.join(__dirname, src);
......@@ -98,20 +100,37 @@ var config = {
}),
new webpack.optimize.OccurenceOrderPlugin(),
new webpack.optimize.DedupePlugin()
// production
//new webpack.optimize.UglifyJsPlugin({
// compress: {
// warnings: false,
// drop_debugger: false
// },
// output: {
// comments: false
// },
// beautify: false
//})
],
pushPlugins: function () {
if (!isProduction) {
return;
}
this.plugins.push.apply(this.plugins, [
//production only
new webpack.optimize.UglifyJsPlugin({
compress: {
warnings: false,
drop_debugger: false
},
output: {
comments: false
},
beautify: false
}),
new CompressionPlugin({
asset: '{file}.gz',
algorithm: 'gzip',
regExp: /\.js$|\.html|\.css|.map$/,
threshold: 10240,
minRatio: 0.8
})
]);
},
stats: {colors: true, reasons: true}
};
config.pushPlugins();
module.exports = config;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment