projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CustomerVendor Picker: auf prototype Picker umgestellt analog zu Part
[kivitendo-erp.git]
/
js
/
kivi.Part.js
diff --git
a/js/kivi.Part.js
b/js/kivi.Part.js
index
595db8c
..
eee498e
100644
(file)
--- a/
js/kivi.Part.js
+++ b/
js/kivi.Part.js
@@
-154,7
+154,7
@@
namespace('kivi.Part', function(ns) {
};
ns.add_assortment_item = function() {
};
ns.add_assortment_item = function() {
- if ($('#a
dd_assortment_item_id
').val() === '') return;
+ if ($('#a
ssortment_picker
').val() === '') return;
$('#row_table_id thead a img').remove();
$('#row_table_id thead a img').remove();
@@
-168,7
+168,7
@@
namespace('kivi.Part', function(ns) {
};
ns.add_assembly_item = function() {
};
ns.add_assembly_item = function() {
- if ($('#a
dd_assembly_item_id
').val() === '') return;
+ if ($('#a
ssembly_picker
').val() === '') return;
var data = $('#assembly :input').serializeArray();
data.push({ name: 'action', value: 'Part/add_assembly_item' },
var data = $('#assembly :input').serializeArray();
data.push({ name: 'action', value: 'Part/add_assembly_item' },
@@
-241,7
+241,7
@@
namespace('kivi.Part', function(ns) {
};
ns.add_makemodel_row = function() {
};
ns.add_makemodel_row = function() {
- if ($('#add_makemodel
id
').val() === '') return;
+ if ($('#add_makemodel').val() === '') return;
var data = $('#makemodel_table :input').serializeArray();
data.push({ name: 'action', value: 'Part/add_makemodel_row' });
var data = $('#makemodel_table :input').serializeArray();
data.push({ name: 'action', value: 'Part/add_makemodel_row' });
@@
-274,7
+274,7
@@
namespace('kivi.Part', function(ns) {
ns.Picker = function($real, options) {
var self = this;
ns.Picker = function($real, options) {
var self = this;
- this.o = $.extend({
+ this.o = $.extend(
true,
{
limit: 20,
delay: 50,
action: {
limit: 20,
delay: 50,
action: {
@@
-388,7
+388,7
@@
namespace('kivi.Part', function(ns) {
if (callbacks && callbacks.match_many) self.run_action(callbacks.match_many, [ data ]);
} else {
self.state = self.STATES.UNDEFINED;
if (callbacks && callbacks.match_many) self.run_action(callbacks.match_many, [ data ]);
} else {
self.state = self.STATES.UNDEFINED;
- if (callbacks && callbacks.match_none) self.run_action(callbacks.match_none);
+ if (callbacks && callbacks.match_none) self.run_action(callbacks.match_none
, [ self, self.$dummy.val() ]
);
}
self.annotate_state();
}
}
self.annotate_state();
}
@@
-425,6
+425,7
@@
namespace('kivi.Part', function(ns) {
}
if (event.which == KEY.ENTER) {
self.handle_changed_text({
}
if (event.which == KEY.ENTER) {
self.handle_changed_text({
+ match_none: self.o.action.commit_none,
match_one: self.o.action.commit_one,
match_many: self.o.action.commit_many
});
match_one: self.o.action.commit_one,
match_many: self.o.action.commit_many
});