Commit f68fe67b 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@64947 954022d7-b5bf-4e40-9824-e11837661b57
parent d6f5bd0b
...@@ -24,6 +24,9 @@ require.config({ ...@@ -24,6 +24,9 @@ require.config({
sockjs : '../vendor/sockjs/sockjs.min', sockjs : '../vendor/sockjs/sockjs.min',
jszip : '../vendor/jszip/jszip.min', jszip : '../vendor/jszip/jszip.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/Word/sdk-all',
api : 'api/documents/api', api : 'api/documents/api',
core : 'common/main/lib/core/application', core : 'common/main/lib/core/application',
notification : 'common/main/lib/core/NotificationCenter', notification : 'common/main/lib/core/NotificationCenter',
...@@ -77,7 +80,8 @@ require.config({ ...@@ -77,7 +80,8 @@ require.config({
'xregexp', 'xregexp',
'sockjs', 'sockjs',
'jszip', 'jszip',
'jsziputils' 'jsziputils',
'jsrsasign'
] ]
}, },
gateway: { gateway: {
...@@ -97,12 +101,17 @@ require([ ...@@ -97,12 +101,17 @@ require([
'backbone', 'backbone',
'bootstrap', 'bootstrap',
'core', 'core',
//'sdk',
'api', 'api',
'analytics', 'analytics',
'gateway', 'gateway',
'locale', 'locale',
'jszip', 'jszip',
'jsziputils' 'jsziputils',
'jsrsasign',
'allfonts',
'sockjs',
'underscore'
], function (Backbone, Bootstrap, Core) { ], function (Backbone, Bootstrap, Core) {
Backbone.history.start(); Backbone.history.start();
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
} }
.loader-page-romb { .loader-page-romb {
width: 50px; width: 40px;
display: inline-block; display: inline-block;
} }
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
var params = getUrlParams(), var params = getUrlParams(),
lang = (params["lang"] || 'en').split("-")[0], lang = (params["lang"] || 'en').split("-")[0],
customer = encodeUrlParam(params["customer"] || 'ONLYOFFICE'); customer = encodeUrlParam(params["customer"] || 'ONLYOFFICE'),
loading = 'Loading...'; loading = 'Loading...';
if ( lang == 'de') loading = 'Ladevorgang...'; if ( lang == 'de') loading = 'Ladevorgang...';
...@@ -235,10 +235,7 @@ ...@@ -235,10 +235,7 @@
<!-- debug end --> <!-- debug end -->
<!-- 3rdparty --> <!-- 3rdparty -->
<script type="text/javascript" src="../../../../OfficeWeb/Common/3rdparty/sockjs/sockjs-0.3.min.js"></script> <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/3rdparty/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/3rdparty/underscore/underscore-min.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/3rdparty/jsrsasign/jsrsasign-latest-all-min.js"></script>
<!-- sdk --> <!-- sdk -->
<script type="text/javascript" src="../../../../OfficeWeb/Common/AllFonts.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/Common/AllFonts.js"></script>
...@@ -422,8 +419,6 @@ ...@@ -422,8 +419,6 @@
<script type="text/javascript" src="../../../../OfficeWeb/OfflineDocuments/ApplyDocumentChanges.js"></script> <script type="text/javascript" src="../../../../OfficeWeb/OfflineDocuments/ApplyDocumentChanges.js"></script>
<!-- application --> <!-- application -->
<!--<script data-main="app" src="../../../vendor/jszip/jszip.min.js"></script>-->
<!--<script data-main="app" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>-->
<script data-main="app" src="../../../vendor/requirejs/require.js"></script> <script data-main="app" src="../../../vendor/requirejs/require.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file
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