tracer/x-editable
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix second param in shown event, see

Browse Source
This commit is contained in:
vitalets 2013-07-07 13:11:35 +04:00
parent df4eb6837e
commit 986613996f
2 changed files with 13 additions and 7 deletions
src/containers
editable-container.js
test/unit
api.js

2
src/containers/editable-container.js

@ -166,7 +166,7 @@ Applied as jQuery method.
/* /*
TODO: added second param mainly to distinguish from bootstrap's shown event. It's a hotfix that will be solved in future versions via namespaced events. TODO: added second param mainly to distinguish from bootstrap's shown event. It's a hotfix that will be solved in future versions via namespaced events.
*/ */
this.$element.triggerHandler('shown', this); this.$element.triggerHandler('shown', $(this.options.scope).data('editable'));
}, this) }, this)
}) })
.editableform('render'); .editableform('render');

18
test/unit/api.js

@ -80,27 +80,33 @@ $(function () {
equal(value, v, 'value ok'); equal(value, v, 'value ok');
}); });
test("'init' event", function () { asyncTest("'init' event", function () {
expect(1); expect(3);
var e = $('<a href="#" data-pk="1" data-url="post.php" data-name="text1">abc</a>').appendTo('#qunit-fixture'); var e = $('<a href="#" data-pk="1" data-url="post.php" data-name="text1">abc</a>').appendTo(fx);
e.on('init', function(e, editable) { e.on('init', function(event, editable) {
equal(e[0], this, 'scope ok');
equal(editable.value, 'abc', 'init triggered, value correct'); equal(editable.value, 'abc', 'init triggered, value correct');
setTimeout(function() {
equal(editable, e.data('editable'), 'editable param ok');
e.remove();
start();
}, timeout);
}); });
e.editable(); e.editable();
}); });
asyncTest("events: shown / hidden (reason: cancel, onblur, nochange, manual)", function () { asyncTest("events: shown / hidden (reason: cancel, onblur, nochange, manual)", function () {
expect(15);
var val = '1', test_reason, var val = '1', test_reason,
e = $('<a href="#" data-pk="1" data-type="select" data-url="post.php" data-name="text" data-value="'+val+'"></a>').appendTo(fx); e = $('<a href="#" data-pk="1" data-type="select" data-url="post.php" data-name="text" data-value="'+val+'"></a>').appendTo(fx);
e.on('shown', function(event) { e.on('shown', function(event, edt) {
//distinguish from native bootstrap popover event //distinguish from native bootstrap popover event
if(arguments.length != 2) return; if(arguments.length != 2) return;
var editable = $(this).data('editable'); var editable = $(this).data('editable');
equal(editable.value, val, 'shown triggered, value correct'); equal(editable.value, val, 'shown triggered, value correct');
equal(edt, editable, 'edt param correct');
}); });
e.on('hidden', function(event, reason) { e.on('hidden', function(event, reason) {