extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 17:52:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into web-components

Browse Source
This commit is contained in:
nathan 2021-08-27 11:40:22 -06:00
commit 61da5c544a
8 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/js/egw_action/egw_action.js
View File

@ -11,7 +11,6 @@
/*egw:uses
egw_action_common;
*/
import "../jsapi/egw.js";
import {
EGW_AO_STATE_NORMAL,
EGW_AO_STATE_VISIBLE,

5
api/js/etemplate/et2_widget_video.ts
View File

@ -156,6 +156,7 @@ export class et2_video extends et2_baseWidget implements et2_IDOMNode
super(_parent, _attrs, ClassWithAttributes.extendAttributes(et2_video._attributes, _child || {}));
this.set_src_type(this.options.src_type);
this.options.starttime = isNaN(this.options.starttime) ? 0 : this.options.starttime;
}
set_src_type(_type)
@ -285,7 +286,7 @@ export class et2_video extends et2_baseWidget implements et2_IDOMNode
let value = _value>100?100:_value;
if (value>= 0)
{
if (this._isYoutube() && this.youtube)
if (this._isYoutube() && this.youtube && typeof this.youtube.setVolume === 'function')
{
this.youtube.setVolume(value);
}
@ -569,7 +570,7 @@ export class et2_video extends et2_baseWidget implements et2_IDOMNode
public videoLoadnigIsFinished()
{
if (this.options.starttime)
if (this.options.starttime >= 0)
{
this.seek_video(this.options.starttime);

2
api/js/jsapi/egw.js
View File

@ -78,7 +78,7 @@ window.app = {classes: {}};
window.egw_appName = egw_script.getAttribute('data-app');
// split includes in legacy js and modules
const legacy_js_regexp = /\/dhtmlx|jquery-ui-dist/;
const legacy_js_regexp = /\/dhtmlx|jquery-ui-dist|^etemplate\/|^phpbrain\//;
// check if egw object was injected by window open
if (typeof window.egw == 'undefined')

1
api/js/jsapi/egw_core.js
View File

@ -10,7 +10,6 @@
* @version $Id$
*/
import "./egw.js";
/**
* This code setups the egw namespace and adds the "extend" function, which is
* used by extension modules to inject their content into the egw object.

6
calendar/templates/mobile/app.css
View File

@ -419,13 +419,13 @@ Hide subsequent headers in week view with non-consolidated owners
top: 2em;
}
#calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader .calendar_calDayColHeader_spacer {
height: calc(33.5em);
height: calc(1.5em + 32px);
}
#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label {
white-space: nowrap;
display: block;
position: static;
width: calc(42%);
width: calc(100% - 58px);
margin-left: 58px;
color: white;
background-color: #2D6393;
@ -2940,7 +2940,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
width: 50px;
}
#calendar-toolbar .nm-mob-header #calendar-toolbar_toolbar {
width: calc(0%);
width: calc(100% - 100px);
display: inline-block;
padding: 0px !important;
}

2
calendar/templates/mobile/app.less
View File

@ -110,7 +110,7 @@
width: 50px;
}
#calendar-toolbar_toolbar{
width: calc(100% - 100px);
width: ~"calc(100% - 100px)";
display: inline-block;
padding: 0px !important;
#toolbar-actionlist {

4
pixelegg/mobile/fw_mobile.css
View File

@ -8383,14 +8383,14 @@ table.egwGridView_grid img.et2_appicon {
margin-bottom: 5px;
}
body #egw_fw_basecontainer #egw_fw_toggler {
z-index: 2;
z-index: 999;
height: 50px;
}
body #egw_fw_basecontainer #egw_fw_toggler span {
top: 15px;
}
body #egw_fw_basecontainer.egw_fw_sidebar_toggleOn #egw_fw_toggler {
z-index: 2;
z-index: 999;
height: 50px;
background-color: transparent;
}

4
pixelegg/mobile/fw_mobile.less
View File

@ -524,7 +524,7 @@
margin-bottom: 5px;
}
#egw_fw_toggler {
z-index: 2;
z-index: 999;
height: 50px;
span {
top: 15px;
@ -533,7 +533,7 @@
}
#egw_fw_basecontainer.egw_fw_sidebar_toggleOn {
#egw_fw_toggler {
z-index: 2;
z-index: 999;
height: 50px;
background-color: transparent;
span {