Преглед изворни кода

Merge branch 'responsive' of github.com:webnotes/wnframework into responsive

version-14
Rushabh Mehta пре 12 година
родитељ
комит
4698dc031b
2 измењених фајлова са 13 додато и 11 уклоњено
  1. +1
    -1
      public/js/legacy/widgets/form/form.js
  2. +12
    -10
      public/js/wn/model/model.js

+ 1
- 1
public/js/legacy/widgets/form/form.js Прегледај датотеку

@@ -156,7 +156,7 @@ _f.Frm.prototype.watch_model_updates = function() {
// on table fields // on table fields
$.each(wn.model.get("DocField", {fieldtype:"Table", parent: me.doctype}), function(i, df) { $.each(wn.model.get("DocField", {fieldtype:"Table", parent: me.doctype}), function(i, df) {
wn.model.on(df.options, "*", function(fieldname, value, doc) { wn.model.on(df.options, "*", function(fieldname, value, doc) {
if(doc.parent===me.docname) {
if(doc.parent===me.docname && doc.parentfield===df.fieldname) {
me.fields_dict[df.fieldname].grid.set_value(fieldname, value, doc); me.fields_dict[df.fieldname].grid.set_value(fieldname, value, doc);
me.script_manager.trigger(fieldname, doc.doctype, doc.name); me.script_manager.trigger(fieldname, doc.doctype, doc.name);
} }


+ 12
- 10
public/js/wn/model/model.js Прегледај датотеку

@@ -209,24 +209,26 @@ $.extend(wn.model, {
raise "CustomerAgeError"; raise "CustomerAgeError";
} }
}) */ }) */
wn.provide("wn.model.events." + doctype + "." + fieldname);
wn.model.events[doctype][fieldname] = fn;
wn.provide("wn.model.events." + doctype);
if(!wn.model.events[doctype][fieldname]) {
wn.model.events[doctype][fieldname] = [];
}
wn.model.events[doctype][fieldname].push(fn);
}, },
trigger: function(fieldname, value, doc) { trigger: function(fieldname, value, doc) {
var run = function(fn) {
fn && fn(fieldname, value, doc)
var run = function(events) {
$.each(events || [], function(i, fn) {
fn && fn(fieldname, value, doc);
});
}; };
if(wn.model.events[doc.doctype]) { if(wn.model.events[doc.doctype]) {
// doctype-level // doctype-level
if(wn.model.events[doc.doctype]['*']) {
wn.model.events[doc.doctype]['*'](fieldname, value, doc);
};
run(wn.model.events[doc.doctype]['*']);
// field-level // field-level
if(wn.model.events[doc.doctype][fieldname]) {
wn.model.events[doc.doctype][fieldname](fieldname, value, doc);
};
run(wn.model.events[doc.doctype][fieldname]);
}; };
}, },


Loading…
Откажи
Сачувај