odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Improve bounce effect to remove auto scroll and remove useless code. 

bzr revid: jra@tinyerp.com-20120713101753-95dnac5u3cm3mwhn
This commit is contained in:
Jiten (OpenERP) 2012-07-13 15:47:53 +05:30
parent 9b52110d4b
commit 7c7d94f002
5 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/web/static/src/js/corelib.js
View File

@ -746,7 +746,6 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
}
return false;
},
rpc: function(url, data, success, error) {
var def = $.Deferred().then(success, error);
var self = this;

29
addons/web/static/src/js/view_form.js
View File

@ -284,26 +284,8 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
}
this._super();
},
on_wrong_click : function (){
var self = this;
var div = $("<div />", {id:"bounce"});
this.$element.find(".oe_form_field, .oe_form_group_cell").click(function (e) {
$(".oe_form_button_edit").wrap(div);
$("#bounce").addClass('oe_bounce_button_left');
var edit_btn = $(".oe_form_button_edit");
if (jQuery(window).scrollTop() > 75 ) {
$('body,html').animate({ scrollTop: 0 }, 200);
}
if (jQuery(window).scrollLeft() > 225 ) {
$('body,html').animate({ scrollLeft: 0 }, 200);
}
self.do_bounce(edit_btn);
e.stopImmediatePropagation();
});
},
on_record_loaded: function(record) {
var self = this, set_values = [];
self.on_wrong_click();
if (!record) {
this.do_warn("Form", "The record could not be found in the database.", true);
return $.Deferred().reject();
@ -345,7 +327,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
}
self.$element.add(self.$buttons).removeClass('oe_form_dirty');
});
},
on_form_changed: function() {
this.trigger("view_content_has_changed");
@ -581,6 +562,12 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
_.each(this.fields,function(field){
field.set({"force_readonly": true});
});
var edit_btn = $(".oe_form_button_edit");
this.$element.find(".oe_form_field, .oe_form_group_cell").click(function (e) {
edit_btn.addClass('oe_bounce_button_left');
self.do_bounce(edit_btn);
e.stopImmediatePropagation();
});
} else {
self.$element.removeClass('oe_form_readonly').addClass('oe_form_editable');
self.$buttons.find('.oe_form_buttons_edit').show();
@ -605,10 +592,8 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
var self = this;
return this.do_save().then(function(result) {
self.set({mode: "view"});
self.on_wrong_click();
});
},
},
on_button_cancel: function(event) {
if (this.can_be_discarded()) {
this.set({mode: "view"});

2
addons/web/static/src/xml/base.xml
View File

@ -681,7 +681,7 @@
</t>
<div t-name="FormView.buttons" class="oe_form_buttons">
<t t-if="widget.options.action_buttons !== false">
<span class="oe_form_buttons_view">
<span class="oe_form_buttons_view">
<button type="button" class="oe_button oe_form_button_edit">Edit</button>
<button type="button" class="oe_button oe_form_button_create">Create</button>
</span>

1
addons/web_kanban/static/src/css/kanban.css
View File

@ -514,6 +514,7 @@
.openerp .oe_kanban_view .oe_kanban_color_9 {
background-color: #ffc7f1;
}
.openerp .oe_form .oe_kanban_view .oe_kanban_column, .openerp .oe_form .oe_kanban_view .oe_kanban_group_header {
padding: 0px;
background: white;

5
addons/web_kanban/static/src/js/kanban.js
View File

@ -419,13 +419,10 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({
var fold_btn = this.$element.find('.oe_dropdown_kanban');
this.$records.click(function (ev) {
if (ev.target == ev.currentTarget) {
if (jQuery(window).scrollTop() > 120 ) {
$('body,html').animate({ scrollTop: 0 }, 200);
}
if (!self.state.folded) {
self.view.do_bounce(add_btn);
}else {
fold_btn.css('display','inline-block');
// fold_btn.css('display','inline-block');
self.view.do_bounce(fold_btn);
}
}