From b344bc09a73d290a4196814cf289f8d7c1405a42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 18 May 2012 16:41:42 +0200 Subject: [PATCH] [REM] Removed check_white method, whose interest was quite low: 1/ it was not working anymore due to template changes (refer to previous commit abotu removing duplicate template) 2/ interest of replacing by white colors whose luminance is < 128 is yet to be proved. bzr revid: tde@openerp.com-20120518144142-oms1loax102s9p91 --- addons/web/static/src/js/view_form.js | 34 +++------------------------ 1 file changed, 3 insertions(+), 31 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 409f92b13eb..fe2b34c2049 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3902,15 +3902,12 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ */ render_list: function() { var self = this; - // get selection values var selection_done = this.get_selection(); - // search in the external relation for all possible values, then render them var rendering_done = $.when(selection_done).pipe(function () { self.filter_selection(); }).pipe(self.proxy('render_elements')); - return rendering_done; }, get_selection: function() { @@ -3964,7 +3961,7 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ this.to_show = this.selection; } else { this.to_show = _.select(this.selection, function(x) { - return _.indexOf(shown, x[index]) !== -1 || x[index] === self.selected_value; + return _.indexOf(shown, x[index]) !== -1 || x[0] === self.selected_value; }); } }, @@ -3975,35 +3972,10 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ var colors = JSON.parse((this.node.attrs || {}).statusbar_colors || "{}"); var color = colors[this.selected_value]; if (color) { - var elem = this.$element.find("li.oe-arrow-list-selected span"); - elem.css("border-color", color); - if (this.check_white(color)) - elem.css("color", "white"); - elem = this.$element.find("li.oe-arrow-list-selected .oe-arrow-list-before"); - elem.css("border-left-color", "rgba(0,0,0,0)"); - elem = this.$element.find("li.oe-arrow-list-selected .oe-arrow-list-after"); - elem.css("border-color", "rgba(0,0,0,0)"); - elem.css("border-left-color", color); + var elem = this.$element.find("li.oe_form_steps_active span"); + elem.css("color", color); } }, - check_white: function(color) { - var div = $("
"); - div.css("display", "none"); - div.css("color", color); - div.appendTo($("body")); - var ncolor = div.css("color"); - div.remove(); - var res = /^\s*rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)\s*$/.exec(ncolor); - if (!res) { - return false; - } - var comps = [parseInt(res[1]), parseInt(res[2]), parseInt(res[3])]; - var lum = comps[0] * 0.3 + comps[1] * 0.59 + comps[1] * 0.11; - if (lum < 128) { - return true; - } - return false; - } }); /**