mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-03 20:09:27 +01:00
fixed includeJS causing jQuery to be included twice and breaking plugins
This commit is contained in:
parent
304dbb95ab
commit
8fa2bb466b
@ -18,6 +18,7 @@ import { ClassWithAttributes } from "./et2_core_inheritance";
|
|||||||
import { et2_evalBool, et2_no_init } from "./et2_core_common";
|
import { et2_evalBool, et2_no_init } from "./et2_core_common";
|
||||||
import { et2_url } from "./et2_widget_url";
|
import { et2_url } from "./et2_widget_url";
|
||||||
import { egw } from "../jsapi/egw_global";
|
import { egw } from "../jsapi/egw_global";
|
||||||
|
import "../../../vendor/egroupware/magicsuggest/magicsuggest.js";
|
||||||
/**
|
/**
|
||||||
* Tag list widget
|
* Tag list widget
|
||||||
*
|
*
|
||||||
|
@ -21,6 +21,7 @@ import {et2_IResizeable} from "./et2_core_interfaces";
|
|||||||
import {et2_evalBool, et2_no_init} from "./et2_core_common";
|
import {et2_evalBool, et2_no_init} from "./et2_core_common";
|
||||||
import {et2_url} from "./et2_widget_url";
|
import {et2_url} from "./et2_widget_url";
|
||||||
import {egw} from "../jsapi/egw_global";
|
import {egw} from "../jsapi/egw_global";
|
||||||
|
import "../../../vendor/egroupware/magicsuggest/magicsuggest.js";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Tag list widget
|
* Tag list widget
|
||||||
|
@ -5,6 +5,8 @@
|
|||||||
// Full source at https://github.com/harvesthq/chosen
|
// Full source at https://github.com/harvesthq/chosen
|
||||||
// Copyright (c) 2011 Harvest http://getharvest.com
|
// Copyright (c) 2011 Harvest http://getharvest.com
|
||||||
|
|
||||||
|
import 'jquery';
|
||||||
|
|
||||||
// MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
|
// MIT License, https://github.com/harvesthq/chosen/blob/master/LICENSE.md
|
||||||
// This file is generated by `grunt build`, do not edit it by hand.
|
// This file is generated by `grunt build`, do not edit it by hand.
|
||||||
(function() {
|
(function() {
|
||||||
@ -113,7 +115,7 @@
|
|||||||
|
|
||||||
this.SelectParser = SelectParser;
|
this.SelectParser = SelectParser;
|
||||||
|
|
||||||
}).call(this);
|
}).call(window);
|
||||||
|
|
||||||
(function() {
|
(function() {
|
||||||
var AbstractChosen, root;
|
var AbstractChosen, root;
|
||||||
@ -458,9 +460,9 @@
|
|||||||
|
|
||||||
root.AbstractChosen = AbstractChosen;
|
root.AbstractChosen = AbstractChosen;
|
||||||
|
|
||||||
}).call(this);
|
}).call(window);
|
||||||
|
|
||||||
(function() {
|
(function(jQuery) {
|
||||||
var $, Chosen, root, _ref,
|
var $, Chosen, root, _ref,
|
||||||
__hasProp = {}.hasOwnProperty,
|
__hasProp = {}.hasOwnProperty,
|
||||||
__extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
|
__extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
|
||||||
@ -802,7 +804,7 @@
|
|||||||
chosen: this
|
chosen: this
|
||||||
});
|
});
|
||||||
var windowHeight = $(window).height(),
|
var windowHeight = $(window).height(),
|
||||||
dropdownTop = this.container.offset().top + this.container.height() - $(window).scrollTop()
|
dropdownTop = this.container.offset().top + this.container.height() - $(window).scrollTop(),
|
||||||
totalHeight = this.dropdown.height() + dropdownTop
|
totalHeight = this.dropdown.height() + dropdownTop
|
||||||
|
|
||||||
this.dropdown.toggleClass('chzn-above', totalHeight > windowHeight);
|
this.dropdown.toggleClass('chzn-above', totalHeight > windowHeight);
|
||||||
@ -1211,4 +1213,4 @@
|
|||||||
|
|
||||||
root.Chosen = Chosen;
|
root.Chosen = Chosen;
|
||||||
|
|
||||||
}).call(this);
|
}).call(window, jQuery);
|
||||||
|
@ -156,7 +156,7 @@ egw.extend('files', egw.MODULE_WND_LOCAL, function(_app, _wnd)
|
|||||||
{
|
{
|
||||||
_jsFiles = [_jsFiles];
|
_jsFiles = [_jsFiles];
|
||||||
}
|
}
|
||||||
const promise = import(_prefix ? _jsFiles.map((src) => _prefix+src) : _jsFiles);
|
const promise = Promise.all(_jsFiles.map((src) => import(_prefix ? _prefix+src : src)));
|
||||||
return typeof _callback === 'undefined' ? promise : promise.then(_callback.call(_context));
|
return typeof _callback === 'undefined' ? promise : promise.then(_callback.call(_context));
|
||||||
|
|
||||||
// @todo check the prefix stuff
|
// @todo check the prefix stuff
|
||||||
|
@ -1,15 +1,16 @@
|
|||||||
/**
|
/**
|
||||||
* EGroupware: Stylite Pixelegg template: hiding/showing header
|
* EGroupware: Pixelegg template: hiding/showing header
|
||||||
*
|
*
|
||||||
* @link http://www.egroupware.org
|
* @link http://www.egroupware.org
|
||||||
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
|
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
|
||||||
* @author Wolfgang Ott <wolfgang.ott@pixelegg.de>
|
* @author Wolfgang Ott <wolfgang.ott@pixelegg.de>
|
||||||
* @package pixelegg
|
* @package pixelegg
|
||||||
* @version $Id: class.pixelegg_framework.inc.php 2741 2013-11-14 13:53:24Z ralfbecker $
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
egw_LAB.wait(function() {
|
import '../../api/js/jquery/chosen/chosen.jquery.js';
|
||||||
|
|
||||||
|
egw_ready.then(function()
|
||||||
|
{
|
||||||
/**
|
/**
|
||||||
* replace [+] on mouseover with quick-add selectbox
|
* replace [+] on mouseover with quick-add selectbox
|
||||||
*
|
*
|
||||||
|
@ -17,7 +17,6 @@ import 'jqueryui';
|
|||||||
import '../../api/js/jsapi/egw_global';
|
import '../../api/js/jsapi/egw_global';
|
||||||
|
|
||||||
import {EgwApp} from '../../api/js/jsapi/egw_app';
|
import {EgwApp} from '../../api/js/jsapi/egw_app';
|
||||||
import {etemplate2} from "../../api/js/etemplate/etemplate2";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* UI for timesheet
|
* UI for timesheet
|
||||||
|
Loading…
Reference in New Issue
Block a user