Commit 883bf368 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

update menu

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64949 954022d7-b5bf-4e40-9824-e11837661b57
parent fcaccb5a
......@@ -22,7 +22,10 @@ require.config({
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
allfonts : '../sdk/Common/AllFonts',
//sdk : '../sdk/Excel/sdk-all',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
......@@ -67,6 +70,17 @@ require.config({
'irregularstack'
]
},
sdk: {
deps: [
'jquery',
'underscore',
'allfonts',
'xregexp',
'sockjs',
'jsziputils',
'jsrsasign'
]
},
gateway: {
deps: [
'jquery'
......@@ -84,11 +98,16 @@ require([
'backbone',
'bootstrap',
'core',
//'sdk',
'api',
'analytics',
'gateway',
'locale',
'jsziputils'
'jsziputils',
'jsrsasign',
'allfonts',
'sockjs',
'underscore'
], function (Backbone, Bootstrap, Core) {
Backbone.history.start();
......
......@@ -37,7 +37,7 @@
}
.loader-page-romb {
width: 50px;
width: 40px;
display: inline-block;
}
......@@ -193,9 +193,19 @@
return urlParams;
}
var lang = getUrlParams()["lang"] || 'en';
lang = lang.split("-")[0];
var loading = 'Loading...';
function encodeUrlParam(str) {
return str.replace(/&/g, '&')
.replace(/"/g, '"')
.replace(/'/g, ''')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;');
}
var params = getUrlParams(),
lang = (params["lang"] || 'en').split("-")[0],
customer = encodeUrlParam(params["customer"] || 'ONLYOFFICE'),
loading = 'Loading...';
if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...';
......@@ -205,8 +215,6 @@
else if ( lang == 'sl') loading = 'Nalaganje...';
else if ( lang == 'tr') loading = 'Yükleniyor...';
var customer = getUrlParams()["customer"] || 'ONLYOFFICE';
document.write(
'<div id="loading-mask" class="loadmask">' +
'<div class="loader-page">' +
......@@ -225,16 +233,12 @@
<div id="viewport"></div>
<!-- sdk -->
<script type="text/javascript" src="../../../../OfficeWeb/Common/AllFonts.js"></script>
<!--<script type="text/javascript" src="../../../sdk/Excel/sdk-all.js"></script>-->
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
<script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
<link rel="stylesheet" type="text/css" href="../../../vendor/perfect-scrollbar/src/perfect-scrollbar.css" />
<script type="text/javascript" src="../../../vendor/perfect-scrollbar/src/jquery.mousewheel.js"></script>
<script type="text/javascript" src="../../../vendor/perfect-scrollbar/src/perfect-scrollbar.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/3rdparty/jsrsasign/jsrsasign-latest-all-min.js"></script>
<script type="text/javascript">
window.g_debug_mode = true;
......
......@@ -18,11 +18,14 @@ require.config({
backbone : '../vendor/backbone/backbone',
bootstrap : '../vendor/bootstrap/dist/js/bootstrap',
text : '../vendor/requirejs-text/text',
perfectscrollbar: '../vendor/perfect-scrollbar/src/perfect-scrollbar',
perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsziputils : '../vendor/jszip-utils/jszip-utils.min',
jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min',
allfonts : '../sdk/Common/AllFonts',
//sdk : '../sdk/PowerPoint/sdk-all',
api : 'api/documents/api',
core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter',
......@@ -67,6 +70,17 @@ require.config({
'irregularstack'
]
},
sdk: {
deps: [
'jquery',
'underscore',
'allfonts',
'xregexp',
'sockjs',
'jsziputils',
'jsrsasign'
]
},
gateway: {
deps: [
'jquery'
......@@ -84,11 +98,17 @@ require([
'backbone',
'bootstrap',
'core',
//'sdk',
'api',
'analytics',
'gateway',
'locale',
'jsziputils'
'jsziputils',
'jsrsasign',
'allfonts',
'sockjs',
'xregexp',
'underscore'
], function (Backbone, Bootstrap, Core) {
Backbone.history.start();
......
<!DOCTYPE html>
<html>
<html style="width:100%; height:100%;">
<head>
<title>ONLYOFFICE Presentation Editor</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
......@@ -35,7 +35,7 @@
}
.loader-page-romb {
width: 50px;
width: 40px;
display: inline-block;
}
......@@ -191,9 +191,19 @@
return urlParams;
}
var lang = getUrlParams()["lang"] || 'en';
lang = lang.split("-")[0];
var loading = 'Loading...';
function encodeUrlParam(str) {
return str.replace(/&/g, '&amp;')
.replace(/"/g, '&quot;')
.replace(/'/g, '&#39;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;');
}
var params = getUrlParams(),
lang = (params["lang"] || 'en').split("-")[0],
customer = encodeUrlParam(params["customer"] || 'ONLYOFFICE'),
loading = 'Loading...';
if ( lang == 'de') loading = 'Ladevorgang...';
else if ( lang == 'es') loading = 'Cargando...';
else if ( lang == 'fr') loading = 'Chargement en cours...';
......@@ -203,8 +213,6 @@
else if ( lang == 'sl') loading = 'Nalaganje...';
else if ( lang == 'tr') loading = 'Yükleniyor...';
var customer = getUrlParams()["customer"] || 'ONLYOFFICE';
document.write(
'<div id="loading-mask" class="loadmask">' +
'<div class="loader-page">' +
......@@ -220,18 +228,14 @@
'</div>');
</script>
<div id="viewport"></div>
<!-- sdk -->
<!--<script type="text/javascript" src="../../../sdk/Excel/sdk-all.js"></script>-->
<div id="viewport"></div>
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
<script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
<link rel="stylesheet" type="text/css" href="../../../vendor/perfect-scrollbar/src/perfect-scrollbar.css" />
<script type="text/javascript" src="../../../vendor/perfect-scrollbar/src/jquery.mousewheel.js"></script>
<script type="text/javascript" src="../../../vendor/perfect-scrollbar/src/perfect-scrollbar.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/3rdparty/jsrsasign/jsrsasign-latest-all-min.js"></script>
<script type="text/javascript">
window.g_debug_mode = true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment