Skip to content

Some fixes and clear behaviour #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
plachintas wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Some fixes and clear behaviour #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29d1571
added images (loading & clear) to package.js
Jul 18, 2014
974a04d
fixed: doSavedTransition
Jul 18, 2014
64f1d05
added clear behavior for input
Jul 18, 2014
56969e0
Merge remote-tracking branch 'upstream/master'
Sep 3, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bootstrap-editable.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
top: 50%;
right: 6px;
margin-top: -6px;

cursor: pointer;
}

.editable-clear-x:hover {
Expand Down
11 changes: 6 additions & 5 deletions editable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,16 @@ m_editable.events({

var val = mEditable.getVal(this.type)(tmpl.$('.editable-input'));

if (typeof self.onsubmit === 'function') {
if (typeof self.onSubmit === 'function') {
if (self.async) {
tmpl.Session.set('loading', true);
this.onsubmit.call(this, val, function () {
this.onSubmit.call(this, val, function () {
tmpl.$('.m_editable-popup').trigger('hide');
doSavedTransition(tmpl);
});
return;
}
this.onsubmit.call(this, val);
this.onSubmit.call(this, val);
} else {
tmpl.$('.editable-click').text(val);
}
Expand Down Expand Up @@ -197,6 +197,7 @@ function resizePopover ($popover, placement) {

$.fn.tooltip.Constructor.prototype.applyPlacement.call({
tip: function () { return $popover; },
getViewportAdjustedDelta: function () { return { top: 0, left: 0 }; },
replaceArrow: function (delta, dimension, position) { $popover.find('.arrow').css(position, delta ? (50 * (1 - delta / dimension) + '%') : ''); }
}, calculatedOffset, placement);
}
Expand Down Expand Up @@ -258,7 +259,7 @@ function generateSettings (settings) {
select2: {},
combodate: {},
showbuttons: true,
onsubmit: null,
onSubmit: null,
value: null,
position: 'left',
title: null,
Expand All @@ -275,8 +276,8 @@ function doSavedTransition (tmpl) {
if(bgColor === 'transparent') {
bgColor = '';
}
$e.css('background-color', bgColor);
$e.addClass('editable-bg-transition');
$e.css('background-color', bgColor);
setTimeout(function(){
$e.removeClass('editable-bg-transition');
}, 1700);
Expand Down
12 changes: 12 additions & 0 deletions inputs/text/text.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,21 @@ _.each(types, function (t) {
});
});

Template.m_editable_form_text.rendered = function() {
this.$('.editable-clear-x').toggle(!!this.data.value);
};

Template.m_editable_form_text.events({
'input input[type="range"]': function (e, tmpl) {
tmpl.$('.output').text(tmpl.$(e.target).val());
},
'click .editable-clear-x': function (e, tmpl) {
tmpl.$('input').val('');
tmpl.$('.editable-clear-x').hide();
},
'keyup input, change input': function (e, tmpl) {
var value = tmpl.$('input').val();
tmpl.$('.editable-clear-x').toggle(!!value);
}
});
Template.m_editable_form_text.helpers({
Expand Down
3 changes: 3 additions & 0 deletions package.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ Package.on_use(function (api) {

// main files
api.add_files([
'img/loading.gif',
'img/clear.png',

'bootstrap-editable.css',
'editable.html',
'editable.js'
Expand Down