Merge remote-tracking branch 'origin/chao-flow' into develop
This commit is contained in:
commit
5d5c8ced24
2
public/js/drawio/js/diagramly/App.js
vendored
2
public/js/drawio/js/diagramly/App.js
vendored
@ -791,7 +791,7 @@ App.main = function(callback, createUi)
|
||||
(urlParams['embed'] == '1' && urlParams['gapi'] == '1')) && isSvgBrowser &&
|
||||
isLocalStorage && (document.documentMode == null || document.documentMode >= 10))))
|
||||
{
|
||||
mxscript('https://apis.google.com/js/api.js?onload=DrawGapiClientCallback', null, null, null, mxClient.IS_SVG);
|
||||
// mxscript('https://apis.google.com/js/api.js?onload=DrawGapiClientCallback', null, null, null, mxClient.IS_SVG);
|
||||
}
|
||||
// Disables client
|
||||
else if (typeof window.gapi === 'undefined')
|
||||
|
4
public/js/drawio/js/grapheditor/Format.js
vendored
4
public/js/drawio/js/grapheditor/Format.js
vendored
@ -774,7 +774,7 @@ BaseFormatPanel.prototype.createOption = function(label, isCheckedFn, setChecked
|
||||
|
||||
var cb = document.createElement('input');
|
||||
cb.setAttribute('type', 'checkbox');
|
||||
cb.style.margin = '1px 6px 0px 0px';
|
||||
// cb.style.margin = '1px 6px 0px 0px';
|
||||
cb.style.verticalAlign = 'top';
|
||||
div.appendChild(cb);
|
||||
|
||||
@ -936,7 +936,7 @@ BaseFormatPanel.prototype.createColorOption = function(label, getColorFn, setCol
|
||||
|
||||
var cb = document.createElement('input');
|
||||
cb.setAttribute('type', 'checkbox');
|
||||
cb.style.margin = '1px 6px 0px 0px';
|
||||
// cb.style.margin = '1px 6px 0px 0px';
|
||||
cb.style.verticalAlign = 'top';
|
||||
|
||||
if (!hideCheckbox)
|
||||
|
@ -791,7 +791,7 @@ App.main = function(callback, createUi)
|
||||
(urlParams['embed'] == '1' && urlParams['gapi'] == '1')) && isSvgBrowser &&
|
||||
isLocalStorage && (document.documentMode == null || document.documentMode >= 10))))
|
||||
{
|
||||
mxscript('https://apis.google.com/js/api.js?onload=DrawGapiClientCallback', null, null, null, mxClient.IS_SVG);
|
||||
// mxscript('https://apis.google.com/js/api.js?onload=DrawGapiClientCallback', null, null, null, mxClient.IS_SVG);
|
||||
}
|
||||
// Disables client
|
||||
else if (typeof window.gapi === 'undefined')
|
||||
|
@ -774,7 +774,7 @@ BaseFormatPanel.prototype.createOption = function(label, isCheckedFn, setChecked
|
||||
|
||||
var cb = document.createElement('input');
|
||||
cb.setAttribute('type', 'checkbox');
|
||||
cb.style.margin = '1px 6px 0px 0px';
|
||||
// cb.style.margin = '1px 6px 0px 0px';
|
||||
cb.style.verticalAlign = 'top';
|
||||
div.appendChild(cb);
|
||||
|
||||
@ -936,7 +936,7 @@ BaseFormatPanel.prototype.createColorOption = function(label, getColorFn, setCol
|
||||
|
||||
var cb = document.createElement('input');
|
||||
cb.setAttribute('type', 'checkbox');
|
||||
cb.style.margin = '1px 6px 0px 0px';
|
||||
// cb.style.margin = '1px 6px 0px 0px';
|
||||
cb.style.verticalAlign = 'top';
|
||||
|
||||
if (!hideCheckbox)
|
||||
|
Loading…
x
Reference in New Issue
Block a user