Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow min-date and max-date options for DatePicker #92

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11,988 changes: 6,105 additions & 5,883 deletions build/build-docs.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/build-docs.js.map

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions dist/vue-strap-lang.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ en: {
],
notSelected: 'Nothing Selected',
required: 'Required',
search: 'Search'
search: 'Search',
selected: '{{count}} selected'
},

es: {
daysOfWeek: ['Do', 'Lu', 'Ma', 'Mi', 'Ju', 'Vi', 'Sa'],
limit: 'Limite alcanzado (máximo {{limit}} items).',
loading: 'Cargando...',
minLength: 'Tamaño Mínimo',
months: [
Expand All @@ -26,7 +28,7 @@ es: {
notSelected: 'Nada seleccionado',
required: 'Requerido',
search: 'Buscar',
limit: 'Limite alcanzado (máximo {{limit}} items).'
selected: '{{count}} seleccionado(s)'
},

'pt-BR': {
Expand Down
1,064 changes: 554 additions & 510 deletions dist/vue-strap.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/vue-strap.js.map

Large diffs are not rendered by default.

15 changes: 10 additions & 5 deletions dist/vue-strap.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/example/alertDocs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<p>how to position the component.</p>
</div>
</doc-table>
</div>
</doc-section>
</template>

<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/example/asideDocs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
</sidebar>
</div>
<doc-code language="markup">
&lt;sidebar v-model="showRight" placement="right" header="Title" width="350">
&lt;sidebar :show="showRight" placement="right" header="Title" width="350">
...
&lt;/sidebar>
&lt;sidebar v-model="showLeft" placement="left" header="Title" width="350">
&lt;sidebar :show="showLeft" placement="left" header="Title" width="350">
...
&lt;/sidebar>
</doc-code>
Expand Down
49 changes: 29 additions & 20 deletions docs/example/buttonGroupDocs.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<doc-section id="button-group" name="***Button Group">
<doc-section id="button-group" name="Button Group">
<div class="bs-example">
<h4>Checkbox</h4>
<button-group v-model="checkboxValue">
Expand All @@ -14,24 +14,24 @@
<h4>Radio</h4>
<p>
<button-group v-model="radioValue" type="primary">
<radio true-value="left">Left</radio>
<radio true-value="middle">Middle</radio>
<radio true-value="right">Right</radio>
<radio selected-value="left">Left</radio>
<radio selected-value="middle">Middle</radio>
<radio selected-value="right">Right</radio>
</button-group>
</p>
<p>
<button-group v-model="radioValue" type="success">
<radio true-value="left">Left</radio>
<radio true-value="middle">Middle</radio>
<radio true-value="right">Right</radio>
<radio selected-value="left">Left</radio>
<radio selected-value="middle">Middle</radio>
<radio selected-value="right">Right</radio>
</button-group>
</p>
<p>
<label>Not buttons:</label>
<button-group v-model="radioValue" type="info" buttons="false">
<radio true-value="left">Left</radio>
<radio true-value="middle">Middle</radio>
<radio true-value="right">Right</radio>
<button-group v-model="radioValue" type="info" :buttons="false">
<radio selected-value="left">Left</radio>
<radio selected-value="middle">Middle</radio>
<radio selected-value="right">Right</radio>
</button-group>
</p>
<p>
Expand All @@ -40,22 +40,22 @@
</div>
<doc-code language="markup">
&lt;button-group v-model="checkboxValue">
&lt;checkbox value="left">Left&lt;/checkbox>
&lt;checkbox value="middle">Middle&lt;/checkbox>
&lt;checkbox value="right">Right&lt;/checkbox>
&lt;checkbox true-value="left">Left&lt;/checkbox>
&lt;checkbox true-value="middle">Middle&lt;/checkbox>
&lt;checkbox true-value="right">Right&lt;/checkbox>
&lt;/button-group>

&lt;button-group v-model="radioValue" type="primary">
&lt;radio value="left">Left&lt;/radio>
&lt;radio value="middle">Middle&lt;/radio>
&lt;radio value="right">Right&lt;/radio>
&lt;radio selected-value="left">Left&lt;/radio>
&lt;radio selected-value="middle">Middle&lt;/radio>
&lt;radio selected-value="right">Right&lt;/radio>
&lt;/button-group>

Not Buttons:
&lt;button-group v-model="radioValue" type="info" buttons="false">
&lt;radio value="left">Left&lt;/radio>
&lt;radio value="middle">Middle&lt;/radio>
&lt;radio value="right">Right&lt;/radio>
&lt;radio selected-value="left">Left&lt;/radio>
&lt;radio selected-value="middle">Middle&lt;/radio>
&lt;radio selected-value="right">Right&lt;/radio>
&lt;/button-group>
</doc-code>

Expand All @@ -76,6 +76,15 @@
<p>Group normal checks if you want to set the same type color for all.</p>
</p>
</div>
<div>
<p>disabled</p>
<p><code>Boolean</code></p>
<p><code>false</code></p>
<p>
<p>Can enable/disable group values.</p>
<p>Disable it if you need independent values but want to group color and/or style.</p>
</p>
</div>
<div>
<p>type</p>
<p><code>String</code>, one of <code>default</code>
Expand Down
2 changes: 1 addition & 1 deletion docs/example/carouselDocs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
</p>
</div>
</doc-table>
</div>
</doc-section>
</template>

<script>
Expand Down
6 changes: 3 additions & 3 deletions docs/example/checkboxDocs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
</div>
<doc-code language="markup">
&lt;checkbox v-model="checkboxValue.one" true-value="1">One&lt;/checkbox>
&lt;checkbox v-model="checkboxValue.two" true-value="two" type="primary">Two&lt;/checkbox>
&lt;checkbox v-model="checkboxValue.three" :true-value="2+1" type="info">Three&lt;/checkbox>
&lt;checkbox button v-model="checkboxValue.four" type="danger">Four&lt;/checkbox>
&lt;checkbox v-model="checkboxValue.two" true-value="two" type="danger/warning/success">Two&lt;/checkbox>
&lt;checkbox v-model="checkboxValue.three" :true-value="2+1" type="primary">Three&lt;/checkbox>
&lt;checkbox button v-model="checkboxValue.four" type="info">Four (default true/false)&lt;/checkbox>
</doc-code>
<doc-table>
<div>
Expand Down
10 changes: 8 additions & 2 deletions docs/example/datepickerDocs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@
<h4>Format</h4>
<v-select v-model="format" :options="formats"></v-select>

<h4>Min and Max Dates</h4>
<datepicker ref="dp" v-model="date" :disabled-days-of-week="disabled" :format="format" :clear-button="clear"
:placeholder="placeholder" width="370px"
min-date="03/05/2017"
max-date="03/12/2017"
></datepicker>

<h4>Reset button</h4>
<checkbox :value="clear" @checked="clear = arguments[0]" type="primary">toggle clear button</checkbox>
</div>
Expand Down Expand Up @@ -71,8 +78,7 @@
<p>Return the selected value.</p>
</div>
</doc-table>
</div>
<div></div>
</doc-section>
</template>

<script>
Expand Down
6 changes: 3 additions & 3 deletions docs/example/gettingStarted.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</div>
<h4>CommonJS</h4>
<doc-code language="javascript">
$ npm install vue-strap
$ npm install github:wffranco/vue-strap --save

var alert = require('vue-strap/src/alert');
// or
Expand All @@ -33,7 +33,7 @@
</doc-code>
<h4>ES6</h4>
<doc-code language="javascript">
$ npm install vue-strap
$ npm install github:wffranco/vue-strap --save

import alert from 'vue-strap/src/alert'
// or
Expand All @@ -48,7 +48,7 @@

<h4>AMD</h4>
<doc-code language="javascript">
$ bower install vue-strap
$ bower install github:wffranco/vue-strap

define(['vue-strap'], function(VueStrap) { var alert = VueStrap.alert; ... });
</doc-code>
Expand Down
2 changes: 1 addition & 1 deletion docs/example/inputDocs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</div>
</div>
<div class="row">
<button-group type="primary" :buttons="false">
<button-group type="primary" :buttons="false" disabled>
<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">
<p><checkbox v-model="check.label">Label</checkbox></p>
<p><checkbox v-model="check.placeholder">placeholder</checkbox></p>
Expand Down
42 changes: 21 additions & 21 deletions docs/example/radioDocs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,33 @@
<doc-section id="radio" name="Radio">
<div class="bs-example">
<h4>Radio</h4>
<radio v-model="radioValue" checked-value="one">One</radio>
<radio v-model="radioValue" checked-value="two" type="danger" disabled>Two (disabled)</radio>
<radio v-model="radioValue" checked-value="two" type="warning" readonly>Two (readonly)</radio>
<radio v-model="radioValue" checked-value="two" type="success">Two</radio>
<radio v-model="radioValue" selected-value="one">One</radio>
<radio v-model="radioValue" selected-value="two" type="danger" disabled>Two (disabled)</radio>
<radio v-model="radioValue" selected-value="two" type="warning" readonly>Two (readonly)</radio>
<radio v-model="radioValue" selected-value="two" type="success">Two</radio>
<hr>
<h4>Radio Button (Single buttons)</h4>
<radio button v-model="radioValue" checked-value="three" type="primary">Three</radio>
<radio button v-model="radioValue" checked-value="four" type="info" disabled>Four (disabled)</radio>
<radio button v-model="radioValue" checked-value="four" type="info" readonly>Four (readonly)</radio>
<radio button v-model="radioValue" checked-value="four" type="info">Four</radio>
<radio button v-model="radioValue" selected-value="three" type="primary">Three</radio>
<radio button v-model="radioValue" selected-value="four" type="info" disabled>Four (disabled)</radio>
<radio button v-model="radioValue" selected-value="four" type="info" readonly>Four (readonly)</radio>
<radio button v-model="radioValue" selected-value="four" type="info">Four</radio>
<p><pre>Radio value: {{ radioValue }}</pre></p>
</div>
<doc-code language="markup">
&lt;radio v-model="radioValue" checked-value="one">One&lt;/radio>
&lt;radio v-model="radioValue" checked-value="two" type="primary">Two&lt;/radio>
&lt;radio button v-model="radioValue" checked-value="three" type="danger">Three&lt;/radio>
&lt;radio button v-model="radioValue" checked-value="four" type="info">Four&lt;/radio>
&lt;radio v-model="radioValue" selected-value="one">One&lt;/radio>
&lt;radio v-model="radioValue" selected-value="two" type="danger/warning/success">Two&lt;/radio>
&lt;radio button v-model="radioValue" selected-value="three" type="primary">Three&lt;/radio>
&lt;radio button v-model="radioValue" selected-value="four" type="info">Four&lt;/radio>
</doc-code>
<doc-table>
<div>
<p>value</p>
<p><code>Mixed</code></p>
<p></p>
<p>Handle the selected value.</p>
<p>button</p>
<p><code>Boolean</code></p>
<p><code>false</code></p>
<p>Enable/Disable button style.</p>
</div>
<div>
<p>checked-value</p>
<p>selected-value</p>
<p><code>Mixed</code></p>
<p><code>true</code></p>
<p>Value to return if the radio item is selected.</p>
Expand All @@ -45,10 +45,10 @@
<p></p>
</div>
<div>
<p>button</p>
<p><code>Boolean</code></p>
<p><code>false</code></p>
<p>Enable/Disable button style.</p>
<p>value</p>
<p><code>Mixed</code></p>
<p></p>
<p>Handle the selected value.</p>
</div>
</doc-table>
<p>See <a href="#button-group">Button Group</a> for more options.</p>
Expand Down
8 changes: 5 additions & 3 deletions docs/example/selectDocs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<p><pre>Multiple select data : {{select.multiple.join(',')}}</pre></p>
<form action="./#select" method="get">
<v-select :options="select.options" options-value="val" v-model="select.multiple" name="animals[]" :search="select.search"
multiple :required="select.required" :clear-button="select.clearButton"
multiple :required="select.required" :clear-button="select.clearButton" :show-count="select.count"
:placeholder="select.placeholder?'Using placeholder':null"
:close-on-select="select.closeOnSelect" :limit="select.limit?3:1024" :disabled="select.disabled"
></v-select>
Expand All @@ -26,7 +26,7 @@
</div>
</div>
<br/>
<button-group type="primary" :buttons="false">
<button-group type="primary" :buttons="false" disabled>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
<p><checkbox v-model="select.disabled">Disabled</checkbox></p>
Expand All @@ -37,7 +37,8 @@
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
<p><checkbox v-model="select.required">Required (empty value if noting selected)</checkbox></p>
<p>
Multiple:
Only for Multiple:
<checkbox v-model="select.count">Show count</checkbox>
<checkbox v-if="select.multiple" v-model="select.limit">Limit (e.g. 3)</checkbox>
<checkbox v-if="select.multiple" v-model="select.closeOnSelect">Close on Select</checkbox>
</p>
Expand Down Expand Up @@ -209,6 +210,7 @@ export default {
select: {
clearButton: false,
closeOnSelect: false,
count: false,
disabled: false,
justified: true,
limit: false,
Expand Down
3 changes: 2 additions & 1 deletion docs/example/tooltipDocs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<p><code>String</code>, one of <code>scale</code> <code>fadein</code></p>
<p><code>scale</code></p>
<p></p>
</div>
<div>
<p>content</p>
<p><code>String</code></p>
Expand All @@ -51,7 +52,7 @@
<p>How to position the tooltip.</p>
</div>
</doc-table>
</div>
</doc-section>
</template>

<script>
Expand Down
2 changes: 1 addition & 1 deletion docs/example/typeaheadDocs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
<p>Used to render every suggestion. Handler:<code>item</code>. The item can be whatever (e.g. <code>string</code>/<code>array</code>/<code>object</code>)</p>
</div>
</doc-table>
</div>
</doc-section>
</template>

<script>
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "vue-strap",
"version": "2.0.0-pre.11",
"version": "2.0.2",
"description": "Bootstrap components built with Vue.js",
"main": "dist/vue-strap.js",
"typings": "types/index.d.ts",
"repository": {
"type": "git",
"url": "yuche/vue-strap"
"url": "wffranco/vue-strap"
},
"homepage": "http://yuche.github.io/vue-strap/",
"homepage": "http://wffranco.github.io/vue-strap/",
"directories": {
"src": "src/"
},
Expand Down Expand Up @@ -74,6 +74,6 @@
"version": "npm run build && git add -A dist",
"postversion": "git push && git push --tags"
},
"author": "yuche",
"author": "wffranco",
"license": "MIT"
}
Loading