diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a0bb275..c1a6fcb 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -2,8 +2,9 @@ X-editable changelog ============================= -Version 1.1.2 wip +Version 1.2.0 wip ---------------------------- +[bug] fix typos (atrophic) [enh] all callbacks scope changed to element (vitalets) [enh] new option 'cancelnochange' to cancel or submit value when it was not changed in form (vitalets) [enh] composite pk can be defined as JSON in data-pk attribute (vitalets) diff --git a/package.json b/package.json index e0700a2..5f92913 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "X-editable", "title": "X-editable", "description": "In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery", - "version": "1.1.1", + "version": "1.2.0", "homepage": "http://github.com/vitalets/x-editable", "author": { "name": "Vitaliy Potapov", diff --git a/src/editable-form/editable-form.js b/src/editable-form/editable-form.js index cbced58..da8e452 100644 --- a/src/editable-form/editable-form.js +++ b/src/editable-form/editable-form.js @@ -479,7 +479,7 @@ Editableform is linked with one of input types, e.g. 'text', 'select' etc. @property scope @type DOMElement|object @default null - @since 1.1.2 + @since 1.2.0 **/ scope: null, /** @@ -488,7 +488,7 @@ Editableform is linked with one of input types, e.g. 'text', 'select' etc. @property cancelnochange @type boolean @default true - @since 1.1.2 + @since 1.2.0 **/ cancelnochange: true };