implement requirejs loading to test
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
.editable-container {
|
||||
max-width: none; /* without this rule poshytip does not stretch */
|
||||
max-width: none !important; /* without this rule poshytip/tooltip does not stretch */
|
||||
}
|
||||
|
||||
.editable-container.popover {
|
||||
@ -10,4 +10,8 @@
|
||||
.editable-container.editable-inline {
|
||||
display: inline;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.editable-container.ui-widget {
|
||||
font-size: inherit; /* jqueryui widget font 1.1em too big, overwrite it */
|
||||
}
|
@ -20,7 +20,7 @@ Applied as jQuery method.
|
||||
init: function(element, options) {
|
||||
this.$element = $(element);
|
||||
//todo: what is in priority: data or js?
|
||||
this.options = $.extend({}, $.fn.editableContainer.defaults, $.fn.editableform.utils.getConfigData(this.$element), options);
|
||||
this.options = $.extend({}, $.fn.editableContainer.defaults, $.fn.editableutils.getConfigData(this.$element), options);
|
||||
this.splitOptions();
|
||||
this.initContainer();
|
||||
|
||||
|
@ -14,7 +14,7 @@
|
||||
$.extend(this.containerOptions, {
|
||||
trigger: 'manual',
|
||||
selector: false,
|
||||
content: 'dfgh'
|
||||
content: ' '
|
||||
});
|
||||
this.call(this.containerOptions);
|
||||
},
|
||||
|
@ -2,10 +2,11 @@
|
||||
* EditableForm utilites
|
||||
*/
|
||||
(function ($) {
|
||||
$.fn.editableform.utils = {
|
||||
//utils
|
||||
$.fn.editableutils = {
|
||||
/**
|
||||
* classic JS inheritance function
|
||||
*/
|
||||
*/
|
||||
inherit: function (Child, Parent) {
|
||||
var F = function() { };
|
||||
F.prototype = Parent.prototype;
|
||||
|
@ -16,6 +16,8 @@
|
||||
*display: inline;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.editable-input {
|
||||
vertical-align: top;
|
||||
display: inline-block; /* should be inline to take effect of parent's white-space: nowrap */
|
||||
@ -31,8 +33,9 @@
|
||||
}
|
||||
|
||||
/*for jquery-ui buttons need set height to look more pretty*/
|
||||
.editable-buttons button.ui-button {
|
||||
.editable-buttons button.ui-button-icon-only {
|
||||
height: 24px;
|
||||
width: 30px;
|
||||
}
|
||||
|
||||
.editableform-loading {
|
||||
|
@ -21,9 +21,9 @@ Editableform is linked with one of input types, e.g. 'text' or 'select'.
|
||||
var TypeConstructor, typeOptions;
|
||||
|
||||
//create input of specified type
|
||||
if(typeof $.fn.editableform.types[this.options.type] === 'function') {
|
||||
TypeConstructor = $.fn.editableform.types[this.options.type];
|
||||
typeOptions = $.fn.editableform.utils.sliceObj(this.options, $.fn.editableform.utils.objectKeys(TypeConstructor.defaults));
|
||||
if(typeof $.fn.editabletypes[this.options.type] === 'function') {
|
||||
TypeConstructor = $.fn.editabletypes[this.options.type];
|
||||
typeOptions = $.fn.editableutils.sliceObj(this.options, $.fn.editableutils.objectKeys(TypeConstructor.defaults));
|
||||
this.input = new TypeConstructor(typeOptions);
|
||||
} else {
|
||||
$.error('Unknown type: '+ this.options.type);
|
||||
@ -246,7 +246,7 @@ Editableform is linked with one of input types, e.g. 'text' or 'select'.
|
||||
$.extend(params, this.options.params.call(this, params));
|
||||
} else {
|
||||
//try parse json in single quotes (from data-params attribute)
|
||||
this.options.params = $.fn.editableform.utils.tryParseJson(this.options.params, true);
|
||||
this.options.params = $.fn.editableutils.tryParseJson(this.options.params, true);
|
||||
$.extend(params, this.options.params);
|
||||
}
|
||||
|
||||
@ -456,7 +456,7 @@ Editableform is linked with one of input types, e.g. 'text' or 'select'.
|
||||
@default true
|
||||
**/
|
||||
showbuttons: true
|
||||
|
||||
|
||||
/*todo:
|
||||
Submit strategy. Can be <code>normal|never</code>
|
||||
<code>submitmode='never'</code> usefull for turning into classic form several inputs and submitting them together manually.
|
||||
@ -493,9 +493,4 @@ Editableform is linked with one of input types, e.g. 'text' or 'select'.
|
||||
//error class attahced to editable-error-block
|
||||
$.fn.editableform.errorBlockClass = 'editable-error';
|
||||
|
||||
//input types
|
||||
$.fn.editableform.types = {};
|
||||
//utils
|
||||
$.fn.editableform.utils = {};
|
||||
|
||||
}(window.jQuery));
|
@ -8,7 +8,7 @@ Makes editable any HTML element on the page. Applied as jQuery method.
|
||||
|
||||
var Editable = function (element, options) {
|
||||
this.$element = $(element);
|
||||
this.options = $.extend({}, $.fn.editable.defaults, $.fn.editableform.utils.getConfigData(this.$element), options);
|
||||
this.options = $.extend({}, $.fn.editable.defaults, $.fn.editableutils.getConfigData(this.$element), options);
|
||||
this.init();
|
||||
};
|
||||
|
||||
@ -33,9 +33,9 @@ Makes editable any HTML element on the page. Applied as jQuery method.
|
||||
this.options.name = this.options.name || this.$element.attr('id');
|
||||
|
||||
//create input of specified type. Input will be used for converting value, not in form
|
||||
if(typeof $.fn.editableform.types[this.options.type] === 'function') {
|
||||
TypeConstructor = $.fn.editableform.types[this.options.type];
|
||||
this.typeOptions = $.fn.editableform.utils.sliceObj(this.options, $.fn.editableform.utils.objectKeys(TypeConstructor.defaults));
|
||||
if(typeof $.fn.editabletypes[this.options.type] === 'function') {
|
||||
TypeConstructor = $.fn.editabletypes[this.options.type];
|
||||
this.typeOptions = $.fn.editableutils.sliceObj(this.options, $.fn.editableutils.objectKeys(TypeConstructor.defaults));
|
||||
this.input = new TypeConstructor(this.typeOptions);
|
||||
} else {
|
||||
$.error('Unknown type: '+ this.options.type);
|
||||
@ -89,7 +89,7 @@ Makes editable any HTML element on the page. Applied as jQuery method.
|
||||
}
|
||||
/**
|
||||
Fired each time when element's text is rendered. Occurs on initialization and on each update of value.
|
||||
Can be used for display customization.
|
||||
Can be used to customize display of value.
|
||||
|
||||
@event render
|
||||
@param {Object} event event object
|
||||
|
@ -26,7 +26,7 @@ $(function(){
|
||||
this.init('address', options, Address.defaults);
|
||||
};
|
||||
|
||||
$.fn.editableform.utils.inherit(Address, $.fn.editableform.types.abstract);
|
||||
$.fn.editableutils.inherit(Address, $.fn.editabletypes.abstract);
|
||||
|
||||
$.extend(Address.prototype, {
|
||||
render: function() {
|
||||
@ -94,7 +94,7 @@ $(function(){
|
||||
}
|
||||
});
|
||||
|
||||
Address.defaults = $.extend({}, $.fn.editableform.types.abstract.defaults, {
|
||||
Address.defaults = $.extend({}, $.fn.editabletypes.abstract.defaults, {
|
||||
tpl: '<div><label><span>City: </span><input type="text" name="city" class="span2"></label></div>'+
|
||||
'<div><label><span>Street: </span><input type="text" name="street" class="span2"></label></div>'+
|
||||
'<div><label><span>Building: </span><input type="text" name="building" class="span1"></label></div>',
|
||||
@ -102,6 +102,6 @@ $(function(){
|
||||
inputclass: 'editable-address'
|
||||
});
|
||||
|
||||
$.fn.editableform.types.address = Address;
|
||||
$.fn.editabletypes.address = Address;
|
||||
|
||||
}(window.jQuery));
|
@ -6,6 +6,9 @@ To create your own input you should inherit from this class.
|
||||
**/
|
||||
(function ($) {
|
||||
|
||||
//types
|
||||
$.fn.editabletypes = {};
|
||||
|
||||
var Abstract = function () { };
|
||||
|
||||
Abstract.prototype = {
|
||||
@ -164,6 +167,6 @@ To create your own input you should inherit from this class.
|
||||
name: null
|
||||
};
|
||||
|
||||
$.extend($.fn.editableform.types, {abstract: Abstract});
|
||||
$.extend($.fn.editabletypes, {abstract: Abstract});
|
||||
|
||||
}(window.jQuery));
|
@ -27,7 +27,7 @@ $(function(){
|
||||
this.init('checklist', options, Checklist.defaults);
|
||||
};
|
||||
|
||||
$.fn.editableform.utils.inherit(Checklist, $.fn.editableform.types.list);
|
||||
$.fn.editableutils.inherit(Checklist, $.fn.editabletypes.list);
|
||||
|
||||
$.extend(Checklist.prototype, {
|
||||
renderList: function() {
|
||||
@ -123,7 +123,7 @@ $(function(){
|
||||
}
|
||||
});
|
||||
|
||||
Checklist.defaults = $.extend({}, $.fn.editableform.types.list.defaults, {
|
||||
Checklist.defaults = $.extend({}, $.fn.editabletypes.list.defaults, {
|
||||
/**
|
||||
@property tpl
|
||||
@default <div></div>
|
||||
@ -173,6 +173,6 @@ $(function(){
|
||||
limitText: 'Selected {checked} of {count}'
|
||||
});
|
||||
|
||||
$.fn.editableform.types.checklist = Checklist;
|
||||
$.fn.editabletypes.checklist = Checklist;
|
||||
|
||||
}(window.jQuery));
|
||||
|
@ -27,7 +27,7 @@ $(function(){
|
||||
this.init('date', options, Date.defaults);
|
||||
|
||||
//set popular options directly from settings or data-* attributes
|
||||
var directOptions = $.fn.editableform.utils.sliceObj(this.options, ['format']);
|
||||
var directOptions = $.fn.editableutils.sliceObj(this.options, ['format']);
|
||||
|
||||
//overriding datepicker config (as by default jQuery extend() is not recursive)
|
||||
this.options.datepicker = $.extend({}, Date.defaults.datepicker, directOptions, options.datepicker);
|
||||
@ -48,7 +48,7 @@ $(function(){
|
||||
this.parsedViewFormat = this.dpg.parseFormat(this.options.viewformat);
|
||||
};
|
||||
|
||||
$.fn.editableform.utils.inherit(Date, $.fn.editableform.types.abstract);
|
||||
$.fn.editableutils.inherit(Date, $.fn.editabletypes.abstract);
|
||||
|
||||
$.extend(Date.prototype, {
|
||||
render: function () {
|
||||
@ -108,7 +108,7 @@ $(function(){
|
||||
|
||||
});
|
||||
|
||||
Date.defaults = $.extend({}, $.fn.editableform.types.abstract.defaults, {
|
||||
Date.defaults = $.extend({}, $.fn.editabletypes.abstract.defaults, {
|
||||
/**
|
||||
@property tpl
|
||||
@default <div></div>
|
||||
@ -165,6 +165,6 @@ $(function(){
|
||||
clear: '× clear'
|
||||
});
|
||||
|
||||
$.fn.editableform.types.date = Date;
|
||||
$.fn.editabletypes.date = Date;
|
||||
|
||||
}(window.jQuery));
|
||||
|
@ -27,7 +27,7 @@ $(function(){
|
||||
this.init('dateui', options, DateUI.defaults);
|
||||
|
||||
//set popular options directly from settings or data-* attributes
|
||||
var directOptions = $.fn.editableform.utils.sliceObj(this.options, ['format']);
|
||||
var directOptions = $.fn.editableutils.sliceObj(this.options, ['format']);
|
||||
|
||||
//overriding datepicker config (as by default jQuery extend() is not recursive)
|
||||
this.options.datepicker = $.extend({}, DateUI.defaults.datepicker, directOptions, options.datepicker);
|
||||
@ -46,7 +46,7 @@ $(function(){
|
||||
this.options.datepicker.dateFormat = this.options.datepicker.format;
|
||||
};
|
||||
|
||||
$.fn.editableform.utils.inherit(DateUI, $.fn.editableform.types.abstract);
|
||||
$.fn.editableutils.inherit(DateUI, $.fn.editabletypes.abstract);
|
||||
|
||||
$.extend(DateUI.prototype, {
|
||||
render: function () {
|
||||
@ -125,7 +125,7 @@ $(function(){
|
||||
|
||||
});
|
||||
|
||||
DateUI.defaults = $.extend({}, $.fn.editableform.types.abstract.defaults, {
|
||||
DateUI.defaults = $.extend({}, $.fn.editabletypes.abstract.defaults, {
|
||||
/**
|
||||
@property tpl
|
||||
@default <div></div>
|
||||
@ -183,7 +183,7 @@ $(function(){
|
||||
clear: '× clear'
|
||||
});
|
||||
|
||||
$.fn.editableform.types.dateui = DateUI;
|
||||
$.fn.editableform.types.date = DateUI;
|
||||
$.fn.editabletypes.dateui = DateUI;
|
||||
$.fn.editabletypes.date = DateUI;
|
||||
|
||||
}(window.jQuery));
|
||||
|
@ -10,7 +10,7 @@ List - abstract class for inputs that have source option loaded from js array or
|
||||
|
||||
};
|
||||
|
||||
$.fn.editableform.utils.inherit(List, $.fn.editableform.types.abstract);
|
||||
$.fn.editableutils.inherit(List, $.fn.editabletypes.abstract);
|
||||
|
||||
$.extend(List.prototype, {
|
||||
render: function () {
|
||||
@ -58,7 +58,7 @@ List - abstract class for inputs that have source option loaded from js array or
|
||||
|
||||
// try parse json in single quotes (for double quotes jquery does automatically)
|
||||
try {
|
||||
this.options.source = $.fn.editableform.utils.tryParseJson(this.options.source, false);
|
||||
this.options.source = $.fn.editableutils.tryParseJson(this.options.source, false);
|
||||
} catch (e) {
|
||||
error.call(this);
|
||||
return;
|
||||
@ -139,7 +139,7 @@ List - abstract class for inputs that have source option loaded from js array or
|
||||
|
||||
if(!$.isArray(this.prependData)) {
|
||||
//try parse json in single quotes
|
||||
this.options.prepend = $.fn.editableform.utils.tryParseJson(this.options.prepend, true);
|
||||
this.options.prepend = $.fn.editableutils.tryParseJson(this.options.prepend, true);
|
||||
if (typeof this.options.prepend === 'string') {
|
||||
this.options.prepend = {'': this.options.prepend};
|
||||
}
|
||||
@ -220,7 +220,7 @@ List - abstract class for inputs that have source option loaded from js array or
|
||||
|
||||
});
|
||||
|
||||
List.defaults = $.extend({}, $.fn.editableform.types.abstract.defaults, {
|
||||
List.defaults = $.extend({}, $.fn.editabletypes.abstract.defaults, {
|
||||
/**
|
||||
Source data for list. If string - considered ajax url to load items. Otherwise should be an array.
|
||||
Array format is: <code>[{value: 1, text: "text"}, {...}]</code><br>
|
||||
@ -249,6 +249,6 @@ List - abstract class for inputs that have source option loaded from js array or
|
||||
sourceError: 'Error when loading list'
|
||||
});
|
||||
|
||||
$.fn.editableform.types.list = List;
|
||||
$.fn.editabletypes.list = List;
|
||||
|
||||
}(window.jQuery));
|
@ -26,7 +26,7 @@ $(function(){
|
||||
this.init('select', options, Select.defaults);
|
||||
};
|
||||
|
||||
$.fn.editableform.utils.inherit(Select, $.fn.editableform.types.list);
|
||||
$.fn.editableutils.inherit(Select, $.fn.editabletypes.list);
|
||||
|
||||
$.extend(Select.prototype, {
|
||||
renderList: function() {
|
||||
@ -54,7 +54,7 @@ $(function(){
|
||||
}
|
||||
});
|
||||
|
||||
Select.defaults = $.extend({}, $.fn.editableform.types.list.defaults, {
|
||||
Select.defaults = $.extend({}, $.fn.editabletypes.list.defaults, {
|
||||
/**
|
||||
@property tpl
|
||||
@default <select></select>
|
||||
@ -62,6 +62,6 @@ $(function(){
|
||||
tpl:'<select></select>'
|
||||
});
|
||||
|
||||
$.fn.editableform.types.select = Select;
|
||||
$.fn.editabletypes.select = Select;
|
||||
|
||||
}(window.jQuery));
|
@ -20,18 +20,18 @@ $(function(){
|
||||
this.init('text', options, Text.defaults);
|
||||
};
|
||||
|
||||
$.fn.editableform.utils.inherit(Text, $.fn.editableform.types.abstract);
|
||||
$.fn.editableutils.inherit(Text, $.fn.editabletypes.abstract);
|
||||
|
||||
$.extend(Text.prototype, {
|
||||
activate: function() {
|
||||
if(this.$input.is(':visible')) {
|
||||
this.$input.focus();
|
||||
$.fn.editableform.utils.setCursorPosition(this.$input.get(0), this.$input.val().length);
|
||||
$.fn.editableutils.setCursorPosition(this.$input.get(0), this.$input.val().length);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Text.defaults = $.extend({}, $.fn.editableform.types.abstract.defaults, {
|
||||
Text.defaults = $.extend({}, $.fn.editabletypes.abstract.defaults, {
|
||||
/**
|
||||
@property tpl
|
||||
@default <input type="text">
|
||||
@ -47,6 +47,6 @@ $(function(){
|
||||
placeholder: null
|
||||
});
|
||||
|
||||
$.fn.editableform.types.text = Text;
|
||||
$.fn.editabletypes.text = Text;
|
||||
|
||||
}(window.jQuery));
|
||||
|
@ -21,7 +21,7 @@ $(function(){
|
||||
this.init('textarea', options, Textarea.defaults);
|
||||
};
|
||||
|
||||
$.fn.editableform.utils.inherit(Textarea, $.fn.editableform.types.abstract);
|
||||
$.fn.editableutils.inherit(Textarea, $.fn.editabletypes.abstract);
|
||||
|
||||
$.extend(Textarea.prototype, {
|
||||
render: function () {
|
||||
@ -60,13 +60,13 @@ $(function(){
|
||||
|
||||
activate: function() {
|
||||
if(this.$input.is(':visible')) {
|
||||
$.fn.editableform.utils.setCursorPosition(this.$input.get(0), this.$input.val().length);
|
||||
$.fn.editableutils.setCursorPosition(this.$input.get(0), this.$input.val().length);
|
||||
this.$input.focus();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Textarea.defaults = $.extend({}, $.fn.editableform.types.abstract.defaults, {
|
||||
Textarea.defaults = $.extend({}, $.fn.editabletypes.abstract.defaults, {
|
||||
/**
|
||||
@property tpl
|
||||
@default <textarea></textarea>
|
||||
@ -87,6 +87,6 @@ $(function(){
|
||||
placeholder: null
|
||||
});
|
||||
|
||||
$.fn.editableform.types.textarea = Textarea;
|
||||
$.fn.editabletypes.textarea = Textarea;
|
||||
|
||||
}(window.jQuery));
|
||||
}(window.jQuery));
|
||||
|
Reference in New Issue
Block a user