Commit c873755a authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch 'b9035-tablesorterFilterTriggersSave' into 'master'

B9035 tablesorter filter triggers save

See merge request !193
parents 5c3c5b2f 6af75b5f
Pipeline #2649 passed with stages
in 2 minutes and 44 seconds
......@@ -10,6 +10,7 @@
*.swp
.project
.webprj
.vscode
nbprojec
# Created by .ignore support plugin (hsz.mobi)
......@@ -48,6 +49,7 @@ composer.lock
/extension/vendor
/extension/Documentation/_make
/extension/Documentation/html
/extension/Resources/Public/Css
/extension/Resources/Public/fonts
/extension/Resources/Public/JavaScript
......
......@@ -579,7 +579,7 @@ module.exports = function (grunt) {
watch: {
scripts: {
files: js_sources.concat(['less/*.less']),
tasks: ['default'],
tasks: ['only-js', 'less'],
options: {
spawn: true
}
......@@ -601,7 +601,7 @@ module.exports = function (grunt) {
// Default task(s).
grunt.registerTask('default', ['jshint', 'concat_in_order', 'uglify', 'copy', 'less']);
grunt.registerTask('only-js', ['jshint', 'concat_in_order', 'uglify', 'copy']);
grunt.registerTask('only-js', ['jshint', 'concat_in_order', 'uglify', 'copy:qfqPlugins', 'copy:worker']);
grunt.registerTask('run-jasmine', ['jshint', 'concat_in_order', 'jasmine']);
......
......@@ -74,19 +74,22 @@ var QfqNS = QfqNS || {};
// and return. The `form.changed` event has already been emitted by `Form#inputAndPasteHandler()`.
return;
}
this.markChanged();
this.markChanged(event.target);
};
n.Form.prototype.inputAndPasteHandler = function (event) {
this.inputAndPasteHandlerCalled = true;
this.markChanged();
this.markChanged(event.target);
};
n.Form.prototype.getFormChanged = function () {
return this.formChanged;
};
n.Form.prototype.markChanged = function () {
n.Form.prototype.markChanged = function (initiator) {
if(initiator.classList.contains("qfq-skip-dirty")) {
return;
}
this.setFormChangedState();
this.eventEmitter.emitEvent('form.changed', n.EventEmitter.makePayload(this, null));
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment