Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #2029 from ONLYOFFICE/feature/vendor-socket-io

Browse source 
Feature/vendor socket io
This commit is contained in:
Julia Radzhabova 2022-10-27 15:26:29 +03:00 committed by GitHub
parent 85364ac614 a4a8e6dcca
commit bfd7448de6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 4641 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/api/documents/cache-scripts.html
View file

@ -10,7 +10,7 @@
</head> </head>
<body> <body>
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script> <script type="text/javascript" src="../../../vendor/socketio/socket.io.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script> <script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/sdk-all-min.js"></script> <script type="text/javascript" src="../../../../sdkjs/word/sdk-all-min.js"></script>

2
apps/documenteditor/embed/index.html
View file

@ -229,7 +229,7 @@
<script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script>
<script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script> <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script>
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script> <script type="text/javascript" src="../../../vendor/socketio/socket.io.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script src="../../../vendor/requirejs/require.js"></script> <script src="../../../vendor/requirejs/require.js"></script>

2
apps/documenteditor/embed/index.html.deploy
View file

@ -220,7 +220,7 @@
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../vendor/jquery/jquery.browser.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.browser.min.js"></script>
<script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.min.js"></script> <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script> <script type="text/javascript" src="../../../vendor/socketio/socket.io.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script src="../../../vendor/requirejs/require.js"></script> <script src="../../../vendor/requirejs/require.js"></script>
<script> <script>

2
apps/documenteditor/embed/index_loader.html
View file

@ -329,7 +329,7 @@
<script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script>
<script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script> <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script>
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script> <script type="text/javascript" src="../../../vendor/socketio/socket.io.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../../sdkjs/develop/sdkjs/word/scripts.js"></script> <script type="text/javascript" src="../../../../sdkjs/develop/sdkjs/word/scripts.js"></script>

2
apps/documenteditor/embed/index_loader.html.deploy
View file

@ -320,7 +320,7 @@
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../vendor/jquery/jquery.browser.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.browser.min.js"></script>
<script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.min.js"></script> <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script> <script type="text/javascript" src="../../../vendor/socketio/socket.io.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<!--sdk--> <!--sdk-->

4
apps/documenteditor/forms/app.js
View file

@ -46,7 +46,7 @@ require.config({
perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar', perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min', xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min', socketio : '../vendor/socketio/socket.io.min',
allfonts : '../../sdkjs/common/AllFonts', allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/word/sdk-all-min', sdk : '../../sdkjs/word/sdk-all-min',
api : 'api/documents/api', api : 'api/documents/api',
@ -100,7 +100,7 @@ require.config({
'underscore', 'underscore',
'allfonts', 'allfonts',
'xregexp', 'xregexp',
'sockjs' 'socketio'
] ]
}, },
gateway: { gateway: {

4
apps/documenteditor/forms/app_dev.js
View file

@ -46,7 +46,7 @@ require.config({
perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar', perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min', xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min', socketio : '../vendor/socketio/socket.io.min',
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',
@ -113,7 +113,7 @@ require([
'analytics', 'analytics',
'gateway', 'gateway',
'locale', 'locale',
'sockjs', 'socketio',
'underscore' 'underscore'
], function (Backbone, Bootstrap, Core) { ], function (Backbone, Bootstrap, Core) {
if (Backbone.History && Backbone.History.started) if (Backbone.History && Backbone.History.started)

4
apps/documenteditor/main/app.js
View file

@ -53,7 +53,7 @@ require.config({
perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar', perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min', xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min', socketio : '../vendor/socketio/socket.io.min',
allfonts : '../../sdkjs/common/AllFonts', allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/word/sdk-all-min', sdk : '../../sdkjs/word/sdk-all-min',
api : 'api/documents/api', api : 'api/documents/api',
@ -107,7 +107,7 @@ require.config({
'underscore', 'underscore',
'allfonts', 'allfonts',
'xregexp', 'xregexp',
'sockjs' 'socketio'
] ]
}, },
gateway: { gateway: {

4
apps/documenteditor/main/app_dev.js
View file

@ -53,7 +53,7 @@ require.config({
perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar', perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min', xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min', socketio : '../vendor/socketio/socket.io.min',
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',
@ -120,7 +120,7 @@ require([
'analytics', 'analytics',
'gateway', 'gateway',
'locale', 'locale',
'sockjs', 'socketio',
'underscore' 'underscore'
], function (Backbone, Bootstrap, Core) { ], function (Backbone, Bootstrap, Core) {
if (Backbone.History && Backbone.History.started) if (Backbone.History && Backbone.History.started)

2
apps/documenteditor/mobile/src/controller/Main.jsx
View file

@ -61,7 +61,7 @@ class MainController extends Component {
!window.sdk_scripts && (window.sdk_scripts = ['../../../../sdkjs/common/AllFonts.js', !window.sdk_scripts && (window.sdk_scripts = ['../../../../sdkjs/common/AllFonts.js',
'../../../../sdkjs/word/sdk-all-min.js']); '../../../../sdkjs/word/sdk-all-min.js']);
let dep_scripts = ['../../../vendor/xregexp/xregexp-all-min.js', let dep_scripts = ['../../../vendor/xregexp/xregexp-all-min.js',
'../../../vendor/sockjs/sockjs.min.js']; '../../../vendor/socketio/socket.io.min.js'];
dep_scripts.push(...window.sdk_scripts); dep_scripts.push(...window.sdk_scripts);
const promise_get_script = (scriptpath) => { const promise_get_script = (scriptpath) => {

2
apps/presentationeditor/embed/index.html
View file

@ -279,7 +279,7 @@
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script>
<script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script> <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script>
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script> <script type="text/javascript" src="../../../vendor/socketio/socket.io.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script src="../../../vendor/requirejs/require.js"></script> <script src="../../../vendor/requirejs/require.js"></script>

2
apps/presentationeditor/embed/index.html.deploy
View file

@ -273,7 +273,7 @@
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../vendor/jquery/jquery.browser.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.browser.min.js"></script>
<script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.min.js"></script> <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script> <script type="text/javascript" src="../../../vendor/socketio/socket.io.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script src="../../../vendor/requirejs/require.js"></script> <script src="../../../vendor/requirejs/require.js"></script>
<script> <script>

2
apps/presentationeditor/embed/index_loader.html
View file

@ -327,7 +327,7 @@
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script>
<script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script> <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script>
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script> <script type="text/javascript" src="../../../vendor/socketio/socket.io.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../../sdkjs/develop/sdkjs/slide/scripts.js"></script> <script type="text/javascript" src="../../../../sdkjs/develop/sdkjs/slide/scripts.js"></script>

2
apps/presentationeditor/embed/index_loader.html.deploy
View file

@ -320,7 +320,7 @@
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../vendor/jquery/jquery.browser.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.browser.min.js"></script>
<script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.min.js"></script> <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script> <script type="text/javascript" src="../../../vendor/socketio/socket.io.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<!--sdk--> <!--sdk-->

4
apps/presentationeditor/main/app.js
View file

@ -53,7 +53,7 @@ require.config({
perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar', perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min', xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min', socketio : '../vendor/socketio/socket.io.min',
allfonts : '../../sdkjs/common/AllFonts', allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/slide/sdk-all-min', sdk : '../../sdkjs/slide/sdk-all-min',
api : 'api/documents/api', api : 'api/documents/api',
@ -106,7 +106,7 @@ require.config({
'underscore', 'underscore',
'allfonts', 'allfonts',
'xregexp', 'xregexp',
'sockjs' 'socketio'
] ]
}, },
gateway: { gateway: {

4
apps/presentationeditor/main/app.reporter.js
View file

@ -48,7 +48,7 @@ require.config({
jquery : '../vendor/jquery/jquery.min', jquery : '../vendor/jquery/jquery.min',
underscore : '../vendor/underscore/underscore-min', underscore : '../vendor/underscore/underscore-min',
xregexp : '../vendor/xregexp/xregexp-all-min', xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min', socketio : '../vendor/socketio/socket.io.min',
allfonts : '../../sdkjs/common/AllFonts', allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/slide/sdk-all-min' sdk : '../../sdkjs/slide/sdk-all-min'
}, },
@ -62,7 +62,7 @@ require.config({
'underscore', 'underscore',
'allfonts', 'allfonts',
'xregexp', 'xregexp',
'sockjs' 'socketio'
] ]
} }
} }

4
apps/presentationeditor/main/app_dev.js
View file

@ -53,7 +53,7 @@ require.config({
perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar', perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min', xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min', socketio : '../vendor/socketio/socket.io.min',
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',
@ -119,7 +119,7 @@ require([
'analytics', 'analytics',
'gateway', 'gateway',
'locale', 'locale',
'sockjs', 'socketio',
'xregexp', 'xregexp',
'underscore' 'underscore'
], function (Backbone, Bootstrap, Core) { ], function (Backbone, Bootstrap, Core) {

6
apps/presentationeditor/main/app_dev.reporter.js
View file

@ -48,7 +48,7 @@ require.config({
jquery : '../vendor/jquery/jquery', jquery : '../vendor/jquery/jquery',
underscore : '../vendor/underscore/underscore', underscore : '../vendor/underscore/underscore',
xregexp : '../vendor/xregexp/xregexp-all-min', xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min', socketio : '../vendor/socketio/socket.io.min',
allfonts : '../../sdkjs/common/AllFonts' allfonts : '../../sdkjs/common/AllFonts'
}, },
shim: { shim: {
@ -61,14 +61,14 @@ require.config({
'underscore', 'underscore',
'allfonts', 'allfonts',
'xregexp', 'xregexp',
'sockjs' 'socketio'
] ]
} }
} }
}); });
require([ require([
'sockjs', 'socketio',
'xregexp', 'xregexp',
'underscore' 'underscore'
], function () { ], function () {

2
apps/presentationeditor/mobile/src/controller/Main.jsx
View file

@ -55,7 +55,7 @@ class MainController extends Component {
!window.sdk_scripts && (window.sdk_scripts = ['../../../../sdkjs/common/AllFonts.js', !window.sdk_scripts && (window.sdk_scripts = ['../../../../sdkjs/common/AllFonts.js',
'../../../../sdkjs/slide/sdk-all-min.js']); '../../../../sdkjs/slide/sdk-all-min.js']);
let dep_scripts = ['../../../vendor/xregexp/xregexp-all-min.js', let dep_scripts = ['../../../vendor/xregexp/xregexp-all-min.js',
'../../../vendor/sockjs/sockjs.min.js']; '../../../vendor/socketio/socket.io.min.js'];
dep_scripts.push(...window.sdk_scripts); dep_scripts.push(...window.sdk_scripts);
const promise_get_script = (scriptpath) => { const promise_get_script = (scriptpath) => {

2
apps/spreadsheeteditor/embed/index.html
View file

@ -252,7 +252,7 @@
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script>
<script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script> <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script>
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script> <script type="text/javascript" src="../../../vendor/socketio/socket.io.min.js"></script>
<script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script> <script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>

2
apps/spreadsheeteditor/embed/index.html.deploy
View file

@ -244,7 +244,7 @@
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../vendor/jquery/jquery.browser.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.browser.min.js"></script>
<script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.min.js"></script> <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script> <script type="text/javascript" src="../../../vendor/socketio/socket.io.min.js"></script>
<script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script> <script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script src="../../../vendor/requirejs/require.js"></script> <script src="../../../vendor/requirejs/require.js"></script>

2
apps/spreadsheeteditor/embed/index_loader.html
View file

@ -326,7 +326,7 @@
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script>
<script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script> <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script>
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script> <script type="text/javascript" src="../../../vendor/socketio/socket.io.min.js"></script>
<script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script> <script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>

2
apps/spreadsheeteditor/embed/index_loader.html.deploy
View file

@ -318,7 +318,7 @@
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../vendor/jquery/jquery.browser.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.browser.min.js"></script>
<script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.min.js"></script> <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script> <script type="text/javascript" src="../../../vendor/socketio/socket.io.min.js"></script>
<script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script> <script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>

4
apps/spreadsheeteditor/main/app.js
View file

@ -53,7 +53,7 @@ require.config({
perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar', perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min', xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min', socketio : '../vendor/socketio/socket.io.min',
allfonts : '../../sdkjs/common/AllFonts', allfonts : '../../sdkjs/common/AllFonts',
sdk : '../../sdkjs/cell/sdk-all-min', sdk : '../../sdkjs/cell/sdk-all-min',
api : 'api/documents/api', api : 'api/documents/api',
@ -106,7 +106,7 @@ require.config({
'underscore', 'underscore',
'allfonts', 'allfonts',
'xregexp', 'xregexp',
'sockjs' 'socketio'
] ]
}, },
gateway: { gateway: {

4
apps/spreadsheeteditor/main/app_dev.js
View file

@ -53,7 +53,7 @@ require.config({
perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar', perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
xregexp : '../vendor/xregexp/xregexp-all-min', xregexp : '../vendor/xregexp/xregexp-all-min',
sockjs : '../vendor/sockjs/sockjs.min', socketio : '../vendor/socketio/socket.io.min',
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',
@ -119,7 +119,7 @@ require([
'analytics', 'analytics',
'gateway', 'gateway',
'locale', 'locale',
'sockjs', 'socketio',
'underscore' 'underscore'
], function (Backbone, Bootstrap, Core) { ], function (Backbone, Bootstrap, Core) {
if (Backbone.History && Backbone.History.started) if (Backbone.History && Backbone.History.started)

2
apps/spreadsheeteditor/mobile/src/controller/Main.jsx
View file

@ -71,7 +71,7 @@ class MainController extends Component {
'../../../vendor/bootstrap/dist/js/bootstrap.min.js', '../../../vendor/bootstrap/dist/js/bootstrap.min.js',
'../../../vendor/underscore/underscore-min.js', '../../../vendor/underscore/underscore-min.js',
'../../../vendor/xregexp/xregexp-all-min.js', '../../../vendor/xregexp/xregexp-all-min.js',
'../../../vendor/sockjs/sockjs.min.js']; '../../../vendor/socketio/socket.io.min.js'];
dep_scripts.push(...window.sdk_scripts); dep_scripts.push(...window.sdk_scripts);
const promise_get_script = (scriptpath) => { const promise_get_script = (scriptpath) => {

4
build/Gruntfile.js
View file

@ -281,7 +281,7 @@ module.exports = function(grunt) {
}, },
} }
}); });
doRegisterTask('sockjs'); doRegisterTask('socketio');
doRegisterTask('xregexp'); doRegisterTask('xregexp');
doRegisterTask('megapixel'); doRegisterTask('megapixel');
doRegisterTask('jquery'); doRegisterTask('jquery');
@ -673,7 +673,7 @@ module.exports = function(grunt) {
grunt.registerTask('deploy-apps-common', ['apps-common-init', 'clean', 'copy', 'imagemin', 'svgmin']); grunt.registerTask('deploy-apps-common', ['apps-common-init', 'clean', 'copy', 'imagemin', 'svgmin']);
grunt.registerTask('deploy-sdk', ['sdk-init', 'clean', copyTask]); grunt.registerTask('deploy-sdk', ['sdk-init', 'clean', copyTask]);
grunt.registerTask('deploy-sockjs', ['sockjs-init', 'clean', 'copy']); grunt.registerTask('deploy-socketio', ['socketio-init', 'clean', 'copy']);
grunt.registerTask('deploy-xregexp', ['xregexp-init', 'clean', 'copy']); grunt.registerTask('deploy-xregexp', ['xregexp-init', 'clean', 'copy']);
grunt.registerTask('deploy-megapixel', ['megapixel-init', 'clean', 'copy']); grunt.registerTask('deploy-megapixel', ['megapixel-init', 'clean', 'copy']);
grunt.registerTask('deploy-jquery', ['jquery-init', 'clean', 'copy']); grunt.registerTask('deploy-jquery', ['jquery-init', 'clean', 'copy']);

4
build/appforms.json
View file

@ -32,7 +32,7 @@
"perfectscrollbar": "common/main/lib/mods/perfect-scrollbar", "perfectscrollbar": "common/main/lib/mods/perfect-scrollbar",
"jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel", "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
"xregexp": "empty:", "xregexp": "empty:",
"sockjs": "empty:", "socketio": "empty:",
"coapisettings": "empty:", "coapisettings": "empty:",
"allfonts": "empty:", "allfonts": "empty:",
"sdk": "empty:", "sdk": "empty:",
@ -85,7 +85,7 @@
"coapisettings", "coapisettings",
"allfonts", "allfonts",
"xregexp", "xregexp",
"sockjs" "socketio"
] ]
}, },
"gateway": { "gateway": {

2
build/bower.json
View file

@ -10,7 +10,7 @@
"requirejs-text": "~2.0.5", "requirejs-text": "~2.0.5",
"less": "~1.5.0", "less": "~1.5.0",
"bootstrap": "~3.0.3", "bootstrap": "~3.0.3",
"sockjs": "~0.3.2", "socketio": "~4.5.3",
"perfect-scrollbar": "latest" "perfect-scrollbar": "latest"
} }
} }

10
build/common.json
View file

@ -180,14 +180,14 @@
} }
} }
}, },
"sockjs": { "socketio": {
"clean": [ "clean": [
"../deploy/web-apps/vendor/sockjs" "../deploy/web-apps/vendor/socketio"
], ],
"copy": { "copy": {
"script": { "script": {
"src": "../vendor/sockjs/sockjs.min.js", "src": "../vendor/socketio/socket.io.min.js",
"dest": "../deploy/web-apps/vendor/sockjs/sockjs.min.js" "dest": "../deploy/web-apps/vendor/socketio/socket.io.min.js"
} }
} }
}, },
@ -272,7 +272,7 @@
"deploy-api", "deploy-api",
"deploy-apps-common", "deploy-apps-common",
"deploy-sdk", "deploy-sdk",
"deploy-sockjs", "deploy-socketio",
"deploy-xregexp", "deploy-xregexp",
"deploy-requirejs", "deploy-requirejs",
"deploy-megapixel", "deploy-megapixel",

4
build/documenteditor.json
View file

@ -30,7 +30,7 @@
"perfectscrollbar": "common/main/lib/mods/perfect-scrollbar", "perfectscrollbar": "common/main/lib/mods/perfect-scrollbar",
"jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel", "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
"xregexp": "empty:", "xregexp": "empty:",
"sockjs": "empty:", "socketio": "empty:",
"coapisettings": "empty:", "coapisettings": "empty:",
"allfonts": "empty:", "allfonts": "empty:",
"sdk": "empty:", "sdk": "empty:",
@ -83,7 +83,7 @@
"coapisettings", "coapisettings",
"allfonts", "allfonts",
"xregexp", "xregexp",
"sockjs" "socketio"
] ]
}, },
"gateway": { "gateway": {

4
build/presentationeditor.json
View file

@ -30,7 +30,7 @@
"perfectscrollbar": "common/main/lib/mods/perfect-scrollbar", "perfectscrollbar": "common/main/lib/mods/perfect-scrollbar",
"jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel", "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
"xregexp": "empty:", "xregexp": "empty:",
"sockjs": "empty:", "socketio": "empty:",
"coapisettings": "empty:", "coapisettings": "empty:",
"allfonts": "empty:", "allfonts": "empty:",
"sdk": "empty:", "sdk": "empty:",
@ -83,7 +83,7 @@
"coapisettings", "coapisettings",
"allfonts", "allfonts",
"xregexp", "xregexp",
"sockjs" "socketio"
] ]
}, },
"gateway": { "gateway": {

4
build/spreadsheeteditor.json
View file

@ -30,7 +30,7 @@
"perfectscrollbar": "common/main/lib/mods/perfect-scrollbar", "perfectscrollbar": "common/main/lib/mods/perfect-scrollbar",
"jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel", "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
"xregexp": "empty:", "xregexp": "empty:",
"sockjs": "empty:", "socketio": "empty:",
"coapisettings": "empty:", "coapisettings": "empty:",
"allfonts": "empty:", "allfonts": "empty:",
"sdk": "empty:", "sdk": "empty:",
@ -83,7 +83,7 @@
"coapisettings", "coapisettings",
"allfonts", "allfonts",
"xregexp", "xregexp",
"sockjs" "socketio"
] ]
}, },
"gateway": { "gateway": {

2
test/documenteditor/main/index.html
View file

@ -77,7 +77,7 @@
<script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script>
<script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script> <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script>
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script> <script type="text/javascript" src="../../../vendor/socketio/socket.io.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script src="../../../vendor/requirejs/require.js"></script> <script src="../../../vendor/requirejs/require.js"></script>

2
test/presentationeditor/main/index.html
View file

@ -147,7 +147,7 @@
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script>
<script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script> <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script>
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script> <script type="text/javascript" src="../../../vendor/socketio/socket.io.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script src="../../../vendor/requirejs/require.js"></script> <script src="../../../vendor/requirejs/require.js"></script>

2
test/spreadsheeteditor/main/index.html
View file

@ -113,7 +113,7 @@
<script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script> <script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script>
<script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script> <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.js"></script>
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script> <script type="text/javascript" src="../../../vendor/socketio/socket.io.min.js"></script>
<script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script> <script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script> <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script src="../../../vendor/requirejs/require.js"></script> <script src="../../../vendor/requirejs/require.js"></script>

7
vendor/socketio/socket.io.esm.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

1
vendor/socketio/socket.io.esm.min.js.map vendored Normal file
View file

File diff suppressed because one or more lines are too long

4560
vendor/socketio/socket.io.js vendored Normal file
View file

File diff suppressed because it is too large Load diff

1
vendor/socketio/socket.io.js.map vendored Normal file
View file

File diff suppressed because one or more lines are too long

7
vendor/socketio/socket.io.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

1
vendor/socketio/socket.io.min.js.map vendored Normal file
View file

File diff suppressed because one or more lines are too long

7
vendor/socketio/socket.io.msgpack.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

1
vendor/socketio/socket.io.msgpack.min.js.map vendored Normal file
View file

File diff suppressed because one or more lines are too long