Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 7c7812df by songchangcheng
Options

解决代码冲突

1 parent b7e8448a
Inline Side-by-side
Showing with 3 additions and 3 deletions
public/drawio/js/diagramly/App.js
......@@ -486,7 +486,7 @@ App.getStoredMode = function()
window.location.hash == '') || (window.location.hash != null &&
window.location.hash.substring(0, 2) == '#G'))
{
mxscript('https://apis.google.com/js/api.js'); //二次开发 删除apis.google.com的加载过程,改为加载本地文件
// mxscript('https://apis.google.com/js/api.js'); //二次开发 删除apis.google.com的加载过程,改为加载本地文件
// mxscript('js/api.js');
}
// Keeps lazy loading for fallback to authenticated Google file if not public in loadFile
......@@ -884,8 +884,8 @@ 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('js/api.js', null, null, null, mxClient.IS_SVG);//二次开发，下载翻墙插件到本地
// mxscript('https://apis.google.com/js/api.js?onload=DrawGapiClientCallback', null, null, null, mxClient.IS_SVG);
// mxscript('js/api.js?onload=DrawGapiClientCallback', null, null, null, mxClient.IS_SVG);//二次开发，下载翻墙插件到本地
}
// Disables client
else if (typeof window.gapi === 'undefined')
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!