tiny fix: add bootstrap responsive to loader

This commit is contained in:
vitalets 2012-11-21 17:11:37 +04:00
parent a5b737e379
commit 0466ec61d7
3 changed files with 6 additions and 2 deletions
src/editable-form
test

@ -28,6 +28,7 @@
.editableform textarea { .editableform textarea {
vertical-align: top; vertical-align: top;
display: inline-block; display: inline-block;
width: auto; /* bootstrap-responsive has width: 100% that breakes layout */
} }
.editableform textarea { .editableform textarea {

@ -73,10 +73,12 @@ function getAssets(f, c, src, libs) {
//style //style
css.push('style.css'); css.push('style.css');
} else { //bootstrap /* bootstrap */
} else {
//core //core
js.unshift(bootstrap+'js/bootstrap.js') js.unshift(bootstrap+'js/bootstrap.js')
css.unshift(bootstrap+'css/bootstrap.css'); css.unshift(bootstrap+'css/bootstrap.css');
css.unshift(bootstrap+'css/bootstrap-responsive.css');
//editable //editable
js.push(forms+'editable-form-bootstrap.js'); js.push(forms+'editable-form-bootstrap.js');

@ -278,7 +278,8 @@ $(function () {
asyncTest("submit to url defined as function", function () { asyncTest("submit to url defined as function", function () {
expect(3); expect(3);
var newText = 'qwe', var newText = 'qwe',
e = $('<a href="#" data-pk="1" id="a"></a>').appendTo(fx).editable({ //should be called even without pk!
e = $('<a href="#" data-pk1="1" id="a"></a>').appendTo(fx).editable({
url: function(params) { url: function(params) {
ok(params.value, newText, 'new text passed in users function'); ok(params.value, newText, 'new text passed in users function');
var d = new $.Deferred; var d = new $.Deferred;