Skip to content

Commit

Permalink
UPDT version
Browse files Browse the repository at this point in the history
  • Loading branch information
@angelmoya @yajo
angelmoya authored and yajo committed Oct 1, 2018
1 parent 404aa35 commit 075be2d
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 36 deletions.
2 changes: 1 addition & 1 deletion web_responsive/__manifest__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"name": "Web Responsive",
"summary": "It provides a mobile compliant interface for Odoo Community "
"web",
"version": "10.0.1.1.0",
"version": "11.0.1.0.0",
"category": "Website",
"website": "https://laslabs.com/",
"author": "LasLabs, Tecnativa, Odoo Community Association (OCA)",
Expand Down
56 changes: 28 additions & 28 deletions web_responsive/static/src/js/web_responsive.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,21 @@ odoo.define('web_responsive', function(require) {
*/
open_menu: function(id, allowOpen) {
this._super(id);
if (allowOpen) return;
if (allowOpen) {
return;
};
var $clicked_menu = this.$secondary_menus.find('a[data-menu=' + id + ']');
$clicked_menu.parents('.oe_secondary_submenu').css('display', '');
},
}

});

SearchView.include({

// Prevent focus of search field on mobile devices
toggle_visibility: function (is_visible) {
$('div.oe_searchview_input').last()
.one('focus', $.proxy(this.preventMobileFocus, this));
toggle_visibility: function(is_visible) {
$('div.oe_searchview_input').last().one(
'focus', $.proxy(this.preventMobileFocus, this));
return this._super(is_visible);
},

Expand All @@ -48,15 +50,14 @@ odoo.define('web_responsive', function(require) {
},

// For lack of Modernizr, TouchEvent will do
isMobile: function () {
try{
isMobile: function() {
try {
document.createEvent('TouchEvent');
return true;
} catch (ex) {
return false;
}
},

}
});

var AppDrawer = Class.extend({
Expand All @@ -82,15 +83,15 @@ odoo.define('web_responsive', function(require) {
'down': this.DOWN,
'pagedown': this.DOWN,
'+': this.RIGHT,
'-': this.LEFT,
'-': this.LEFT
};
this.initDrawer();
var $clickZones = $('.odoo_webclient_container, ' +
'a.oe_menu_leaf, ' +
'a.oe_menu_toggler, ' +
'a.oe_logo, ' +
'i.oe_logo_edit'
);
'a.oe_menu_leaf, ' +
'a.oe_menu_toggler, ' +
'a.oe_logo, ' +
'i.oe_logo_edit'
);
$clickZones.click($.proxy(this.handleClickZones, this));
core.bus.on('resize', this, this.handleWindowResize);
core.bus.on('keydown', this, this.handleNavKeys);
Expand All @@ -101,9 +102,9 @@ odoo.define('web_responsive', function(require) {
this.$el = $('.drawer');
this.$el.drawer();
this.$el.one('drawer.opened', $.proxy(this.onDrawerOpen, this));
this.$el.on('drawer.opened', function setIScrollProbes(){
this.$el.on('drawer.opened', function setIScrollProbes() {
var onIScroll = function() {
var transform = (this.iScroll.y) ? this.iScroll.y * -1 : 0;
var transform = this.iScroll.y ? this.iScroll.y * -1 : 0;
$(this).find('#appDrawerAppPanelHead').css(
'transform', 'matrix(1, 0, 0, 1, 0, ' + transform + ')'
);
Expand Down Expand Up @@ -131,7 +132,7 @@ odoo.define('web_responsive', function(require) {

// It provides keyboard shortcuts for app drawer nav
handleNavKeys: function(e) {
if (!this.isOpen){
if (!this.isOpen) {
return;
}
var directionCode = $.hotkeys.specialKeys[e.keyCode.toString()];
Expand All @@ -141,7 +142,7 @@ odoo.define('web_responsive', function(require) {
this.directionCodes[directionCode]
);
this.selectAppLink($link);
} else if ($.hotkeys.specialKeys[e.keyCode.toString()] == 'esc') {
} else if ($.hotkeys.specialKeys[e.keyCode.toString()] === 'esc') {
this.handleClickZones();
} else {
var buffer = this.handleKeyBuffer(e.keyCode);
Expand Down Expand Up @@ -226,7 +227,7 @@ odoo.define('web_responsive', function(require) {
var obj = [],
$objs = this.$appLinks;

switch(direction){
switch (direction) {
case this.LEFT:
obj = $objs[$objs.index($appLink) - 1];
if (!obj) {
Expand Down Expand Up @@ -273,19 +274,19 @@ odoo.define('web_responsive', function(require) {
function filterWithin(left, right) {
return function() {
var $this = $(this),
thisMiddle = $this.offset().left + ($this.width() / 2);
thisMiddle = $this.offset().left + $this.width() / 2;
return thisMiddle >= left && thisMiddle <= right;
};
}
var left = $obj.offset().left,
right = left + $obj.outerWidth();
return $grid.filter(filterWithin(left, right));
},
}

});

// It inits a new AppDrawer when the web client is ready
core.bus.on('web_client_ready', null, function () {
core.bus.on('web_client_ready', null, function() {
new AppDrawer();
});

Expand All @@ -294,11 +295,10 @@ odoo.define('web_responsive', function(require) {
get_default_view: function() {
var default_view = this._super()
if (config.device.size_class <= config.device.SIZES.XS &&
default_view.type != 'kanban' &&
this.views['kanban'])
{
default_view.type = 'kanban';
};
default_view.type !== 'kanban' &&
this.views.kanban) {
default_view.type = 'kanban';
};
return default_view;
},
});
Expand Down
43 changes: 37 additions & 6 deletions web_responsive/static/src/less/main.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,50 @@ main {
overflow: auto;
> .o_main_content {
overflow: initial;
@media (max-width: @screen-xs-max) {
> .o_content {
> .o_content {
@media (max-width: @screen-xs-max) {
overflow: initial;
}

@media (min-width: @screen-sm-min) {
// .o_content is the one to display horizontal scrolling in
// case of wide tables
.table-responsive {
overflow-x: visible;
}
}
}
}
}
}

// Remove z-index from CP buttons so it doesn't overlap the menu
.o_control_panel {
.btn-group > .btn.active {
z-index: initial;
@media (max-width: @screen-sm-max) {
.o_control_panel {
// Remove z-index from CP buttons so it doesn't overlap the menu
.btn-group > .btn.active {
z-index: initial;
}

// Better horizontal space usage for buttons
justify-content: space-between;
.o_cp_left, .o_cp_right {
width: inherit;
}

.o_search_options > .o_dropdown {
&.hidden-xs {
// No other way to display "Group By" button :(
display: inline-block !important;
}

// Hack to hide text and display larger icons
> .btn {
font-size: 0;
> .fa {
font-size: @odoo-font-size-base * 1.4;
}
}
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion web_responsive/views/web.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
name="App Drawer - Web Client"
>

<xpath expr="//div[@class='o_sub_menu']" position="replace" />
<xpath expr="//div[@contains('class', 'o_sub_menu')]" position="replace" />

<xpath expr="//t[@t-set='head']" position="inside">
<meta charset="utf-8" />
Expand Down

0 comments on commit 075be2d

Please sign in to comment.