Skip to content

Commit

Permalink
version bump to 1.5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
tofutim committed Nov 10, 2015
1 parent d33965e commit c054d55
Show file tree
Hide file tree
Showing 18 changed files with 82 additions and 58 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
X-editable changelog
=============================

Version 1.5.3 Nov 9, 2015
----------------------------
Working through various PRs to ultimately move dev to master

Version 1.5.2 wip
----------------------------
Expand Down
2 changes: 1 addition & 1 deletion Package.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package >
<metadata>
<id>x-editable</id>
<version>1.5.2</version>
<version>1.5.3</version>
<authors>Vitaliy Potapov</authors>
<owners>Vitaliy Potapov</owners>
<licenseUrl>https://github.com/vitalets/x-editable/blob/master/LICENSE-MIT</licenseUrl>
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "vitalets/x-editable",
"description": "In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery.",
"version": "1.5.2",
"version": "1.5.3",
"homepage": "http://github.com/vitalets/x-editable",
"authors": [
{
Expand Down
3 changes: 3 additions & 0 deletions dist/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
X-editable changelog
=============================

Version 1.5.3 Nov 9, 2015
----------------------------
Working through various PRs to ultimately move dev to master

Version 1.5.2 wip
----------------------------
Expand Down
8 changes: 7 additions & 1 deletion dist/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery.

## Project status
Unfortunately, **project is currently frozen**, as I don't have enough time for it.
You could try use it as is, but there may be some bugs with newer versions of dependend libraries (e.g. bootstrap).
I would really appreciate if someone take care of it.. See [#610](https://github.com/vitalets/x-editable/issues/610).
Vitalets.

## Live demo
**http://vitalets.github.io/x-editable/demo.html**

Expand Down Expand Up @@ -121,4 +127,4 @@ Result will appear in `dist` directory.

## License
Copyright (c) 2012 Vitaliy Potapov
Licensed under the MIT license.
Licensed under the MIT license.
4 changes: 2 additions & 2 deletions dist/bootstrap-editable/css/bootstrap-editable.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*! X-editable - v1.5.2
/*! X-editable - v1.5.3
* In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery
* http://github.com/vitalets/x-editable
* Copyright (c) 2013 Vitaliy Potapov; Licensed MIT */
* Copyright (c) 2015 Vitaliy Potapov; Licensed MIT */
.editableform {
margin-bottom: 0; /* overwrites bootstrap margin */
}
Expand Down
17 changes: 10 additions & 7 deletions dist/bootstrap-editable/js/bootstrap-editable.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*! X-editable - v1.5.2
/*! X-editable - v1.5.3
* In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery
* http://github.com/vitalets/x-editable
* Copyright (c) 2013 Vitaliy Potapov; Licensed MIT */
* Copyright (c) 2015 Vitaliy Potapov; Licensed MIT */
/**
Form with single input element, two buttons and two states: normal/loading.
Applied as jQuery method to DIV tag (not to form tag!). This is because form can be in loading state when spinner shown.
Expand Down Expand Up @@ -222,7 +222,7 @@ Editableform is linked with one of input types, e.g. 'text', 'select' etc.

//if value not changed --> trigger 'nochange' event and return
/*jslint eqeq: true*/
if (!this.options.savenochange && this.input.value2str(newValue) == this.input.value2str(this.value)) {
if (!this.options.savenochange && this.input.value2str(newValue) === this.input.value2str(this.value)) {
/*jslint eqeq: false*/
/**
Fired when value not changed but form is submitted. Requires savenochange = false.
Expand Down Expand Up @@ -530,9 +530,10 @@ Editableform is linked with one of input types, e.g. 'text', 'select' etc.
/**
Success callback. Called when value successfully sent on server and **response status = 200**.
Usefull to work with json response. For example, if your backend response can be <code>{success: true}</code>
or <code>{success: false, msg: "server error"}</code> you can check it inside this callback.
or `{success: false, msg: "server error"}` you can check it inside this callback.
If it returns **string** - means error occured and string is shown as error message.
If it returns **object like** <code>{newValue: &lt;something&gt;}</code> - it overwrites value, submitted by user.
If it returns **object like** `{newValue: &lt;something&gt;}` - it overwrites value, submitted by user
(useful when server changes value).
Otherwise newValue simply rendered into element.
@property success
Expand Down Expand Up @@ -1046,7 +1047,7 @@ Applied as jQuery method.
.on({
save: $.proxy(this.save, this), //click on submit button (value changed)
nochange: $.proxy(function(){ this.hide('nochange'); }, this), //click on submit button (value NOT changed)
cancel: $.proxy(function(){ this.hide('cancel'); }, this), //click on calcel button
cancel: $.proxy(function(){ this.hide('cancel'); }, this), //click on cancel button
show: $.proxy(function() {
if(this.delayedHide) {
this.hide(this.delayedHide.reason);
Expand Down Expand Up @@ -2929,7 +2930,9 @@ $(function(){
activate: function() {
if(this.$input.is(':visible')) {
this.$input.focus();
$.fn.editableutils.setCursorPosition(this.$input.get(0), this.$input.val().length);
if (this.$input.is('input,textarea') && !this.$input.is('[type="checkbox"],[type="range"]')) {
$.fn.editableutils.setCursorPosition(this.$input.get(0), this.$input.val().length);
}
if(this.toggleClear) {
this.toggleClear();
}
Expand Down
10 changes: 5 additions & 5 deletions dist/bootstrap-editable/js/bootstrap-editable.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/bootstrap3-editable/css/bootstrap-editable.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*! X-editable - v1.5.2
/*! X-editable - v1.5.3
* In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery
* http://github.com/vitalets/x-editable
* Copyright (c) 2013 Vitaliy Potapov; Licensed MIT */
* Copyright (c) 2015 Vitaliy Potapov; Licensed MIT */
.editableform {
margin-bottom: 0; /* overwrites bootstrap margin */
}
Expand Down
17 changes: 10 additions & 7 deletions dist/bootstrap3-editable/js/bootstrap-editable.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*! X-editable - v1.5.2
/*! X-editable - v1.5.3
* In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery
* http://github.com/vitalets/x-editable
* Copyright (c) 2013 Vitaliy Potapov; Licensed MIT */
* Copyright (c) 2015 Vitaliy Potapov; Licensed MIT */
/**
Form with single input element, two buttons and two states: normal/loading.
Applied as jQuery method to DIV tag (not to form tag!). This is because form can be in loading state when spinner shown.
Expand Down Expand Up @@ -222,7 +222,7 @@ Editableform is linked with one of input types, e.g. 'text', 'select' etc.

//if value not changed --> trigger 'nochange' event and return
/*jslint eqeq: true*/
if (!this.options.savenochange && this.input.value2str(newValue) == this.input.value2str(this.value)) {
if (!this.options.savenochange && this.input.value2str(newValue) === this.input.value2str(this.value)) {
/*jslint eqeq: false*/
/**
Fired when value not changed but form is submitted. Requires savenochange = false.
Expand Down Expand Up @@ -530,9 +530,10 @@ Editableform is linked with one of input types, e.g. 'text', 'select' etc.
/**
Success callback. Called when value successfully sent on server and **response status = 200**.
Usefull to work with json response. For example, if your backend response can be <code>{success: true}</code>
or <code>{success: false, msg: "server error"}</code> you can check it inside this callback.
or `{success: false, msg: "server error"}` you can check it inside this callback.
If it returns **string** - means error occured and string is shown as error message.
If it returns **object like** <code>{newValue: &lt;something&gt;}</code> - it overwrites value, submitted by user.
If it returns **object like** `{newValue: &lt;something&gt;}` - it overwrites value, submitted by user
(useful when server changes value).
Otherwise newValue simply rendered into element.
@property success
Expand Down Expand Up @@ -1046,7 +1047,7 @@ Applied as jQuery method.
.on({
save: $.proxy(this.save, this), //click on submit button (value changed)
nochange: $.proxy(function(){ this.hide('nochange'); }, this), //click on submit button (value NOT changed)
cancel: $.proxy(function(){ this.hide('cancel'); }, this), //click on calcel button
cancel: $.proxy(function(){ this.hide('cancel'); }, this), //click on cancel button
show: $.proxy(function() {
if(this.delayedHide) {
this.hide(this.delayedHide.reason);
Expand Down Expand Up @@ -2929,7 +2930,9 @@ $(function(){
activate: function() {
if(this.$input.is(':visible')) {
this.$input.focus();
$.fn.editableutils.setCursorPosition(this.$input.get(0), this.$input.val().length);
if (this.$input.is('input,textarea') && !this.$input.is('[type="checkbox"],[type="range"]')) {
$.fn.editableutils.setCursorPosition(this.$input.get(0), this.$input.val().length);
}
if(this.toggleClear) {
this.toggleClear();
}
Expand Down
10 changes: 5 additions & 5 deletions dist/bootstrap3-editable/js/bootstrap-editable.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/jquery-editable/css/jquery-editable.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*! X-editable - v1.5.2
/*! X-editable - v1.5.3
* In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery
* http://github.com/vitalets/x-editable
* Copyright (c) 2013 Vitaliy Potapov; Licensed MIT */
* Copyright (c) 2015 Vitaliy Potapov; Licensed MIT */
.editableform {
margin-bottom: 0; /* overwrites bootstrap margin */
}
Expand Down
17 changes: 10 additions & 7 deletions dist/jquery-editable/js/jquery-editable-poshytip.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*! X-editable - v1.5.2
/*! X-editable - v1.5.3
* In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery
* http://github.com/vitalets/x-editable
* Copyright (c) 2013 Vitaliy Potapov; Licensed MIT */
* Copyright (c) 2015 Vitaliy Potapov; Licensed MIT */
/**
Form with single input element, two buttons and two states: normal/loading.
Applied as jQuery method to DIV tag (not to form tag!). This is because form can be in loading state when spinner shown.
Expand Down Expand Up @@ -222,7 +222,7 @@ Editableform is linked with one of input types, e.g. 'text', 'select' etc.

//if value not changed --> trigger 'nochange' event and return
/*jslint eqeq: true*/
if (!this.options.savenochange && this.input.value2str(newValue) == this.input.value2str(this.value)) {
if (!this.options.savenochange && this.input.value2str(newValue) === this.input.value2str(this.value)) {
/*jslint eqeq: false*/
/**
Fired when value not changed but form is submitted. Requires savenochange = false.
Expand Down Expand Up @@ -530,9 +530,10 @@ Editableform is linked with one of input types, e.g. 'text', 'select' etc.
/**
Success callback. Called when value successfully sent on server and **response status = 200**.
Usefull to work with json response. For example, if your backend response can be <code>{success: true}</code>
or <code>{success: false, msg: "server error"}</code> you can check it inside this callback.
or `{success: false, msg: "server error"}` you can check it inside this callback.
If it returns **string** - means error occured and string is shown as error message.
If it returns **object like** <code>{newValue: &lt;something&gt;}</code> - it overwrites value, submitted by user.
If it returns **object like** `{newValue: &lt;something&gt;}` - it overwrites value, submitted by user
(useful when server changes value).
Otherwise newValue simply rendered into element.
@property success
Expand Down Expand Up @@ -1046,7 +1047,7 @@ Applied as jQuery method.
.on({
save: $.proxy(this.save, this), //click on submit button (value changed)
nochange: $.proxy(function(){ this.hide('nochange'); }, this), //click on submit button (value NOT changed)
cancel: $.proxy(function(){ this.hide('cancel'); }, this), //click on calcel button
cancel: $.proxy(function(){ this.hide('cancel'); }, this), //click on cancel button
show: $.proxy(function() {
if(this.delayedHide) {
this.hide(this.delayedHide.reason);
Expand Down Expand Up @@ -2929,7 +2930,9 @@ $(function(){
activate: function() {
if(this.$input.is(':visible')) {
this.$input.focus();
$.fn.editableutils.setCursorPosition(this.$input.get(0), this.$input.val().length);
if (this.$input.is('input,textarea') && !this.$input.is('[type="checkbox"],[type="range"]')) {
$.fn.editableutils.setCursorPosition(this.$input.get(0), this.$input.val().length);
}
if(this.toggleClear) {
this.toggleClear();
}
Expand Down
8 changes: 4 additions & 4 deletions dist/jquery-editable/js/jquery-editable-poshytip.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/jqueryui-editable/css/jqueryui-editable.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*! X-editable - v1.5.2
/*! X-editable - v1.5.3
* In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery
* http://github.com/vitalets/x-editable
* Copyright (c) 2013 Vitaliy Potapov; Licensed MIT */
* Copyright (c) 2015 Vitaliy Potapov; Licensed MIT */
.editableform {
margin-bottom: 0; /* overwrites bootstrap margin */
}
Expand Down
17 changes: 10 additions & 7 deletions dist/jqueryui-editable/js/jqueryui-editable.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*! X-editable - v1.5.2
/*! X-editable - v1.5.3
* In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery
* http://github.com/vitalets/x-editable
* Copyright (c) 2013 Vitaliy Potapov; Licensed MIT */
* Copyright (c) 2015 Vitaliy Potapov; Licensed MIT */
/**
Form with single input element, two buttons and two states: normal/loading.
Applied as jQuery method to DIV tag (not to form tag!). This is because form can be in loading state when spinner shown.
Expand Down Expand Up @@ -222,7 +222,7 @@ Editableform is linked with one of input types, e.g. 'text', 'select' etc.

//if value not changed --> trigger 'nochange' event and return
/*jslint eqeq: true*/
if (!this.options.savenochange && this.input.value2str(newValue) == this.input.value2str(this.value)) {
if (!this.options.savenochange && this.input.value2str(newValue) === this.input.value2str(this.value)) {
/*jslint eqeq: false*/
/**
Fired when value not changed but form is submitted. Requires savenochange = false.
Expand Down Expand Up @@ -530,9 +530,10 @@ Editableform is linked with one of input types, e.g. 'text', 'select' etc.
/**
Success callback. Called when value successfully sent on server and **response status = 200**.
Usefull to work with json response. For example, if your backend response can be <code>{success: true}</code>
or <code>{success: false, msg: "server error"}</code> you can check it inside this callback.
or `{success: false, msg: "server error"}` you can check it inside this callback.
If it returns **string** - means error occured and string is shown as error message.
If it returns **object like** <code>{newValue: &lt;something&gt;}</code> - it overwrites value, submitted by user.
If it returns **object like** `{newValue: &lt;something&gt;}` - it overwrites value, submitted by user
(useful when server changes value).
Otherwise newValue simply rendered into element.
@property success
Expand Down Expand Up @@ -1046,7 +1047,7 @@ Applied as jQuery method.
.on({
save: $.proxy(this.save, this), //click on submit button (value changed)
nochange: $.proxy(function(){ this.hide('nochange'); }, this), //click on submit button (value NOT changed)
cancel: $.proxy(function(){ this.hide('cancel'); }, this), //click on calcel button
cancel: $.proxy(function(){ this.hide('cancel'); }, this), //click on cancel button
show: $.proxy(function() {
if(this.delayedHide) {
this.hide(this.delayedHide.reason);
Expand Down Expand Up @@ -2929,7 +2930,9 @@ $(function(){
activate: function() {
if(this.$input.is(':visible')) {
this.$input.focus();
$.fn.editableutils.setCursorPosition(this.$input.get(0), this.$input.val().length);
if (this.$input.is('input,textarea') && !this.$input.is('[type="checkbox"],[type="range"]')) {
$.fn.editableutils.setCursorPosition(this.$input.get(0), this.$input.val().length);
}
if(this.toggleClear) {
this.toggleClear();
}
Expand Down
8 changes: 4 additions & 4 deletions dist/jqueryui-editable/js/jqueryui-editable.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "X-editable",
"title": "X-editable",
"description": "In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery",
"version": "1.5.2",
"version": "1.5.3",
"homepage": "http://github.com/vitalets/x-editable",
"author": {
"name": "Vitaliy Potapov",
Expand Down

0 comments on commit c054d55

Please sign in to comment.