[MERGE] Merge with trunk
bzr revid: jke@openerp.com-20131218131034-61e6su19shmrgakz
This commit is contained in:
commit
e4469e0aeb
|
@ -37,6 +37,7 @@ This module provides the core of the OpenERP Web Client.
|
||||||
"static/lib/jquery.tipsy/jquery.tipsy.js",
|
"static/lib/jquery.tipsy/jquery.tipsy.js",
|
||||||
"static/lib/jquery.textext/jquery.textext.js",
|
"static/lib/jquery.textext/jquery.textext.js",
|
||||||
"static/lib/jquery.timeago/jquery.timeago.js",
|
"static/lib/jquery.timeago/jquery.timeago.js",
|
||||||
|
"static/lib/bootstrap/js/bootstrap.js",
|
||||||
"static/lib/qweb/qweb2.js",
|
"static/lib/qweb/qweb2.js",
|
||||||
"static/lib/underscore/underscore.js",
|
"static/lib/underscore/underscore.js",
|
||||||
"static/lib/underscore.string/lib/underscore.string.js",
|
"static/lib/underscore.string/lib/underscore.string.js",
|
||||||
|
|
|
@ -535,7 +535,6 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea
|
||||||
resp(_(arguments).chain()
|
resp(_(arguments).chain()
|
||||||
.compact()
|
.compact()
|
||||||
.map(function (completion) {
|
.map(function (completion) {
|
||||||
console.log(completion);
|
|
||||||
if (completion.length && completion[0].facet !== undefined) {
|
if (completion.length && completion[0].facet !== undefined) {
|
||||||
completion[0].first = true;
|
completion[0].first = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,7 +15,6 @@ Graph Views for Web Client.
|
||||||
'version': '3.0',
|
'version': '3.0',
|
||||||
'depends': ['web'],
|
'depends': ['web'],
|
||||||
'js': [
|
'js': [
|
||||||
'static/lib/dropdown.js',
|
|
||||||
'static/lib/flotr2/lib/bean.js',
|
'static/lib/flotr2/lib/bean.js',
|
||||||
'static/lib/flotr2/js/Flotr.js',
|
'static/lib/flotr2/js/Flotr.js',
|
||||||
'static/lib/flotr2/js/DefaultOptions.js',
|
'static/lib/flotr2/js/DefaultOptions.js',
|
||||||
|
|
|
@ -1,92 +0,0 @@
|
||||||
/* ============================================================
|
|
||||||
* bootstrap-dropdown.js v2.0.2
|
|
||||||
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
|
|
||||||
* ============================================================
|
|
||||||
* Copyright 2012 Twitter, Inc.
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
* ============================================================ */
|
|
||||||
|
|
||||||
|
|
||||||
!function( $ ){
|
|
||||||
|
|
||||||
"use strict"
|
|
||||||
|
|
||||||
/* DROPDOWN CLASS DEFINITION
|
|
||||||
* ========================= */
|
|
||||||
|
|
||||||
var toggle = '[data-toggle="dropdown"]'
|
|
||||||
, Dropdown = function ( element ) {
|
|
||||||
var $el = $(element).on('click.dropdown.data-api', this.toggle)
|
|
||||||
$('html').on('click.dropdown.data-api', function () {
|
|
||||||
$el.parent().removeClass('open')
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
Dropdown.prototype = {
|
|
||||||
|
|
||||||
constructor: Dropdown
|
|
||||||
|
|
||||||
, toggle: function ( e ) {
|
|
||||||
var $this = $(this)
|
|
||||||
, selector = $this.attr('data-target')
|
|
||||||
, $parent
|
|
||||||
, isActive
|
|
||||||
|
|
||||||
if (!selector) {
|
|
||||||
selector = $this.attr('href')
|
|
||||||
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
|
|
||||||
}
|
|
||||||
|
|
||||||
$parent = $(selector)
|
|
||||||
$parent.length || ($parent = $this.parent())
|
|
||||||
|
|
||||||
isActive = $parent.hasClass('open')
|
|
||||||
|
|
||||||
clearMenus()
|
|
||||||
!isActive && $parent.toggleClass('open')
|
|
||||||
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
function clearMenus() {
|
|
||||||
$(toggle).parent().removeClass('open')
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* DROPDOWN PLUGIN DEFINITION
|
|
||||||
* ========================== */
|
|
||||||
|
|
||||||
$.fn.dropdown = function ( option ) {
|
|
||||||
return this.each(function () {
|
|
||||||
var $this = $(this)
|
|
||||||
, data = $this.data('dropdown')
|
|
||||||
if (!data) $this.data('dropdown', (data = new Dropdown(this)))
|
|
||||||
if (typeof option == 'string') data[option].call($this)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
$.fn.dropdown.Constructor = Dropdown
|
|
||||||
|
|
||||||
|
|
||||||
/* APPLY TO STANDARD DROPDOWN ELEMENTS
|
|
||||||
* =================================== */
|
|
||||||
|
|
||||||
$(function () {
|
|
||||||
$('html').on('click.dropdown.data-api', clearMenus)
|
|
||||||
$('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
|
|
||||||
})
|
|
||||||
|
|
||||||
}( window.jQuery );
|
|
Loading…
Reference in New Issue