dev build 1.5.1
This commit is contained in:
parent
c77ebf6cc7
commit
b3a73fe08e
dist
CHANGELOG.txtREADME.md
bootstrap-editable/js
bootstrap3-editable/js
jquery-editable/js
jqueryui-editable/js
3
dist/CHANGELOG.txt
vendored
3
dist/CHANGELOG.txt
vendored
@ -4,7 +4,8 @@ X-editable changelog
|
|||||||
|
|
||||||
Version 1.5.1 wip
|
Version 1.5.1 wip
|
||||||
----------------------------
|
----------------------------
|
||||||
[enh #400] allow `validate` to change submitted value (vitalets)
|
[bug] select2: placeholder not shown if value initially empty (vitalets)
|
||||||
|
[enh #400] allow `validate` to change submitted value, also fix #354 (vitalets)
|
||||||
[enh #396] bs3 popover: placement `auto` (vitalets)
|
[enh #396] bs3 popover: placement `auto` (vitalets)
|
||||||
[bug #357] select2: tags mode with space separator (vitalets)
|
[bug #357] select2: tags mode with space separator (vitalets)
|
||||||
[bug #374] dateui: clear button does not submit (vitalets)
|
[bug #374] dateui: clear button does not submit (vitalets)
|
||||||
|
50
dist/README.md
vendored
50
dist/README.md
vendored
@ -5,7 +5,10 @@ In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery.
|
|||||||
## Live demo
|
## Live demo
|
||||||
**http://vitalets.github.io/x-editable/demo.html**
|
**http://vitalets.github.io/x-editable/demo.html**
|
||||||
|
|
||||||
## Installation
|
## Documentation
|
||||||
|
**http://vitalets.github.io/x-editable**
|
||||||
|
|
||||||
|
## How to get it
|
||||||
|
|
||||||
### Manual download
|
### Manual download
|
||||||
Use **http://vitalets.github.io/x-editable** main page.
|
Use **http://vitalets.github.io/x-editable** main page.
|
||||||
@ -16,22 +19,38 @@ bower install x-editable
|
|||||||
````
|
````
|
||||||
|
|
||||||
### CDN
|
### CDN
|
||||||
|
Bootstrap 3 build:
|
||||||
````js
|
````js
|
||||||
<link href="//cdnjs.cloudflare.com/ajax/libs/x-editable/1.4.6/bootstrap-editable/css/bootstrap-editable.css" rel="stylesheet"/>
|
<link href="//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/css/bootstrap-editable.css" rel="stylesheet"/>
|
||||||
<script src="//cdnjs.cloudflare.com/ajax/libs/x-editable/1.4.6/bootstrap-editable/js/bootstrap-editable.min.js"></script>
|
<script src="//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/js/bootstrap-editable.min.js"></script>
|
||||||
````
|
````
|
||||||
|
|
||||||
## Documentation
|
Bootstrap 2 build:
|
||||||
**http://vitalets.github.io/x-editable**
|
````js
|
||||||
|
<link href="//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap-editable/css/bootstrap-editable.css" rel="stylesheet"/>
|
||||||
|
<script src="//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap-editable/js/bootstrap-editable.min.js"></script>
|
||||||
|
````
|
||||||
|
|
||||||
|
jQuery UI build:
|
||||||
|
````js
|
||||||
|
<link href="//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/jqueryui-editable/css/jqueryui-editable.css" rel="stylesheet"/>
|
||||||
|
<script src="//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/jqueryui-editable/js/jqueryui-editable.min.js"></script>
|
||||||
|
````
|
||||||
|
|
||||||
|
jQuery only build:
|
||||||
|
````js
|
||||||
|
<link href="//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/jquery-editable/css/jquery-editable.css" rel="stylesheet"/>
|
||||||
|
<script src="//cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/jquery-editable/js/jquery-editable-poshytip.min.js"></script>
|
||||||
|
````
|
||||||
|
|
||||||
|
|
||||||
## Reporting issues
|
## Reporting issues
|
||||||
Please provide [jsFiddles](http://jsfiddle.net)!
|
Please **provide jsFiddle** when creating issues!
|
||||||
Use these as template:
|
It's really saves much time. Use these as template:
|
||||||
1. [jsFiddle bootstrap 3](http://jsfiddle.net/xBB5x/2265)
|
1. [jsFiddle Bootstrap 3](http://jsfiddle.net/xBB5x/2265/)
|
||||||
2. [jsFiddle bootstrap 2](http://jsfiddle.net/xBB5x/1817)
|
2. [jsFiddle Bootstrap 2](http://jsfiddle.net/xBB5x/1817/)
|
||||||
3. [jsFiddle jqueryui](http://jsfiddle.net/xBB5x/196)
|
3. [jsFiddle jQuery-ui](http://jsfiddle.net/xBB5x/2511/)
|
||||||
4. [jsFiddle jquery](http://jsfiddle.net/xBB5x/197)
|
4. [jsFiddle jQuery](http://jsfiddle.net/xBB5x/197)
|
||||||
Your feedback is very appreciated!
|
Your feedback is very appreciated!
|
||||||
|
|
||||||
## Contribution
|
## Contribution
|
||||||
@ -48,9 +67,10 @@ npm i -g grunt-cli
|
|||||||
````
|
````
|
||||||
3.Install dependencies:
|
3.Install dependencies:
|
||||||
````
|
````
|
||||||
|
cd x-editable
|
||||||
npm i
|
npm i
|
||||||
````
|
````
|
||||||
4.Make your awesome changes.
|
4.Make your changes:
|
||||||
````
|
````
|
||||||
vim editable-form.js
|
vim editable-form.js
|
||||||
````
|
````
|
||||||
@ -58,7 +78,7 @@ vim editable-form.js
|
|||||||
````
|
````
|
||||||
vim /test/unit/*.js
|
vim /test/unit/*.js
|
||||||
````
|
````
|
||||||
6.Run tests:
|
6.Run tests in cli:
|
||||||
````
|
````
|
||||||
grunt test
|
grunt test
|
||||||
````
|
````
|
||||||
@ -82,13 +102,13 @@ By default test run on bootstrap 3 popup version, but you can test any other bui
|
|||||||
* popup: http://127.0.0.1:8000/test/?f=plain&c=popup
|
* popup: http://127.0.0.1:8000/test/?f=plain&c=popup
|
||||||
* inline: http://127.0.0.1:8000/test/?f=plain&c=inline
|
* inline: http://127.0.0.1:8000/test/?f=plain&c=inline
|
||||||
|
|
||||||
7.Commit and push on github:
|
7.Commit and push back on github:
|
||||||
````
|
````
|
||||||
git add .
|
git add .
|
||||||
git commit -m'refactor editable form, fix #123'
|
git commit -m'refactor editable form, fix #123'
|
||||||
git push origin
|
git push origin
|
||||||
````
|
````
|
||||||
8.Make pull request on github.
|
8.Make pull request on github (to `dev` branch).
|
||||||
|
|
||||||
Thanks for your support!
|
Thanks for your support!
|
||||||
|
|
||||||
|
16
dist/bootstrap-editable/js/bootstrap-editable.js
vendored
16
dist/bootstrap-editable/js/bootstrap-editable.js
vendored
@ -3587,7 +3587,11 @@ $(function(){
|
|||||||
});
|
});
|
||||||
//remote source (simple)
|
//remote source (simple)
|
||||||
$('#country').editable({
|
$('#country').editable({
|
||||||
source: '/getCountries'
|
source: '/getCountries',
|
||||||
|
select2: {
|
||||||
|
placeholder: 'Select Country',
|
||||||
|
minimumInputLength: 1
|
||||||
|
}
|
||||||
});
|
});
|
||||||
//remote source (advanced)
|
//remote source (advanced)
|
||||||
$('#country').editable({
|
$('#country').editable({
|
||||||
@ -3768,18 +3772,22 @@ $(function(){
|
|||||||
|
|
||||||
// if defined remote source AND no multiple mode AND no user's initSelection provided -->
|
// if defined remote source AND no multiple mode AND no user's initSelection provided -->
|
||||||
// we should somehow get text for provided id.
|
// we should somehow get text for provided id.
|
||||||
// The solution is to use element's text as text for that id
|
// The solution is to use element's text as text for that id (exclude empty)
|
||||||
if(this.isRemote && !this.isMultiple && !this.options.select2.initSelection) {
|
if(this.isRemote && !this.isMultiple && !this.options.select2.initSelection) {
|
||||||
// customId and customText are methods to extract `id` and `text` from data object
|
// customId and customText are methods to extract `id` and `text` from data object
|
||||||
// we can use this workaround only if user did not define these methods
|
// we can use this workaround only if user did not define these methods
|
||||||
// otherwise we cant construct data object
|
// otherwise we cant construct data object
|
||||||
var customId = this.options.select2.id,
|
var customId = this.options.select2.id,
|
||||||
customText = this.options.select2.formatSelection;
|
customText = this.options.select2.formatSelection;
|
||||||
|
|
||||||
if(!customId && !customText) {
|
if(!customId && !customText) {
|
||||||
var data = {id: value, text: $(this.options.scope).text()};
|
var $el = $(this.options.scope);
|
||||||
|
if (!$el.data('editable').isEmpty) {
|
||||||
|
var data = {id: value, text: $el.text()};
|
||||||
this.$input.select2('data', data);
|
this.$input.select2('data', data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
input2value: function() {
|
input2value: function() {
|
||||||
@ -6215,7 +6223,7 @@ $(function(){
|
|||||||
viewformat: null,
|
viewformat: null,
|
||||||
/**
|
/**
|
||||||
Configuration of datepicker.
|
Configuration of datepicker.
|
||||||
Full list of options: http://vitalets.github.com/bootstrap-datepicker
|
Full list of options: http://bootstrap-datepicker.readthedocs.org/en/latest/options.html
|
||||||
|
|
||||||
@property datepicker
|
@property datepicker
|
||||||
@type object
|
@type object
|
||||||
|
File diff suppressed because one or more lines are too long
@ -3587,7 +3587,11 @@ $(function(){
|
|||||||
});
|
});
|
||||||
//remote source (simple)
|
//remote source (simple)
|
||||||
$('#country').editable({
|
$('#country').editable({
|
||||||
source: '/getCountries'
|
source: '/getCountries',
|
||||||
|
select2: {
|
||||||
|
placeholder: 'Select Country',
|
||||||
|
minimumInputLength: 1
|
||||||
|
}
|
||||||
});
|
});
|
||||||
//remote source (advanced)
|
//remote source (advanced)
|
||||||
$('#country').editable({
|
$('#country').editable({
|
||||||
@ -3768,18 +3772,22 @@ $(function(){
|
|||||||
|
|
||||||
// if defined remote source AND no multiple mode AND no user's initSelection provided -->
|
// if defined remote source AND no multiple mode AND no user's initSelection provided -->
|
||||||
// we should somehow get text for provided id.
|
// we should somehow get text for provided id.
|
||||||
// The solution is to use element's text as text for that id
|
// The solution is to use element's text as text for that id (exclude empty)
|
||||||
if(this.isRemote && !this.isMultiple && !this.options.select2.initSelection) {
|
if(this.isRemote && !this.isMultiple && !this.options.select2.initSelection) {
|
||||||
// customId and customText are methods to extract `id` and `text` from data object
|
// customId and customText are methods to extract `id` and `text` from data object
|
||||||
// we can use this workaround only if user did not define these methods
|
// we can use this workaround only if user did not define these methods
|
||||||
// otherwise we cant construct data object
|
// otherwise we cant construct data object
|
||||||
var customId = this.options.select2.id,
|
var customId = this.options.select2.id,
|
||||||
customText = this.options.select2.formatSelection;
|
customText = this.options.select2.formatSelection;
|
||||||
|
|
||||||
if(!customId && !customText) {
|
if(!customId && !customText) {
|
||||||
var data = {id: value, text: $(this.options.scope).text()};
|
var $el = $(this.options.scope);
|
||||||
|
if (!$el.data('editable').isEmpty) {
|
||||||
|
var data = {id: value, text: $el.text()};
|
||||||
this.$input.select2('data', data);
|
this.$input.select2('data', data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
input2value: function() {
|
input2value: function() {
|
||||||
@ -6283,7 +6291,7 @@ $(function(){
|
|||||||
viewformat: null,
|
viewformat: null,
|
||||||
/**
|
/**
|
||||||
Configuration of datepicker.
|
Configuration of datepicker.
|
||||||
Full list of options: http://vitalets.github.com/bootstrap-datepicker
|
Full list of options: http://bootstrap-datepicker.readthedocs.org/en/latest/options.html
|
||||||
|
|
||||||
@property datepicker
|
@property datepicker
|
||||||
@type object
|
@type object
|
||||||
|
File diff suppressed because one or more lines are too long
@ -3587,7 +3587,11 @@ $(function(){
|
|||||||
});
|
});
|
||||||
//remote source (simple)
|
//remote source (simple)
|
||||||
$('#country').editable({
|
$('#country').editable({
|
||||||
source: '/getCountries'
|
source: '/getCountries',
|
||||||
|
select2: {
|
||||||
|
placeholder: 'Select Country',
|
||||||
|
minimumInputLength: 1
|
||||||
|
}
|
||||||
});
|
});
|
||||||
//remote source (advanced)
|
//remote source (advanced)
|
||||||
$('#country').editable({
|
$('#country').editable({
|
||||||
@ -3768,18 +3772,22 @@ $(function(){
|
|||||||
|
|
||||||
// if defined remote source AND no multiple mode AND no user's initSelection provided -->
|
// if defined remote source AND no multiple mode AND no user's initSelection provided -->
|
||||||
// we should somehow get text for provided id.
|
// we should somehow get text for provided id.
|
||||||
// The solution is to use element's text as text for that id
|
// The solution is to use element's text as text for that id (exclude empty)
|
||||||
if(this.isRemote && !this.isMultiple && !this.options.select2.initSelection) {
|
if(this.isRemote && !this.isMultiple && !this.options.select2.initSelection) {
|
||||||
// customId and customText are methods to extract `id` and `text` from data object
|
// customId and customText are methods to extract `id` and `text` from data object
|
||||||
// we can use this workaround only if user did not define these methods
|
// we can use this workaround only if user did not define these methods
|
||||||
// otherwise we cant construct data object
|
// otherwise we cant construct data object
|
||||||
var customId = this.options.select2.id,
|
var customId = this.options.select2.id,
|
||||||
customText = this.options.select2.formatSelection;
|
customText = this.options.select2.formatSelection;
|
||||||
|
|
||||||
if(!customId && !customText) {
|
if(!customId && !customText) {
|
||||||
var data = {id: value, text: $(this.options.scope).text()};
|
var $el = $(this.options.scope);
|
||||||
|
if (!$el.data('editable').isEmpty) {
|
||||||
|
var data = {id: value, text: $el.text()};
|
||||||
this.$input.select2('data', data);
|
this.$input.select2('data', data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
input2value: function() {
|
input2value: function() {
|
||||||
|
File diff suppressed because one or more lines are too long
14
dist/jqueryui-editable/js/jqueryui-editable.js
vendored
14
dist/jqueryui-editable/js/jqueryui-editable.js
vendored
@ -3587,7 +3587,11 @@ $(function(){
|
|||||||
});
|
});
|
||||||
//remote source (simple)
|
//remote source (simple)
|
||||||
$('#country').editable({
|
$('#country').editable({
|
||||||
source: '/getCountries'
|
source: '/getCountries',
|
||||||
|
select2: {
|
||||||
|
placeholder: 'Select Country',
|
||||||
|
minimumInputLength: 1
|
||||||
|
}
|
||||||
});
|
});
|
||||||
//remote source (advanced)
|
//remote source (advanced)
|
||||||
$('#country').editable({
|
$('#country').editable({
|
||||||
@ -3768,18 +3772,22 @@ $(function(){
|
|||||||
|
|
||||||
// if defined remote source AND no multiple mode AND no user's initSelection provided -->
|
// if defined remote source AND no multiple mode AND no user's initSelection provided -->
|
||||||
// we should somehow get text for provided id.
|
// we should somehow get text for provided id.
|
||||||
// The solution is to use element's text as text for that id
|
// The solution is to use element's text as text for that id (exclude empty)
|
||||||
if(this.isRemote && !this.isMultiple && !this.options.select2.initSelection) {
|
if(this.isRemote && !this.isMultiple && !this.options.select2.initSelection) {
|
||||||
// customId and customText are methods to extract `id` and `text` from data object
|
// customId and customText are methods to extract `id` and `text` from data object
|
||||||
// we can use this workaround only if user did not define these methods
|
// we can use this workaround only if user did not define these methods
|
||||||
// otherwise we cant construct data object
|
// otherwise we cant construct data object
|
||||||
var customId = this.options.select2.id,
|
var customId = this.options.select2.id,
|
||||||
customText = this.options.select2.formatSelection;
|
customText = this.options.select2.formatSelection;
|
||||||
|
|
||||||
if(!customId && !customText) {
|
if(!customId && !customText) {
|
||||||
var data = {id: value, text: $(this.options.scope).text()};
|
var $el = $(this.options.scope);
|
||||||
|
if (!$el.data('editable').isEmpty) {
|
||||||
|
var data = {id: value, text: $el.text()};
|
||||||
this.$input.select2('data', data);
|
this.$input.select2('data', data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
input2value: function() {
|
input2value: function() {
|
||||||
|
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user