Use socket.io
This commit is contained in:
		
							parent
							
								
									b01dca86e5
								
							
						
					
					
						commit
						a4a8e6dcca
					
				| 
						 | 
				
			
			@ -46,7 +46,7 @@ require.config({
 | 
			
		|||
        perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
 | 
			
		||||
        jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
 | 
			
		||||
        xregexp         : '../vendor/xregexp/xregexp-all-min',
 | 
			
		||||
        socketio        : '../vendor/socketio/socket.io.min.js',
 | 
			
		||||
        socketio        : '../vendor/socketio/socket.io.min',
 | 
			
		||||
        allfonts        : '../../sdkjs/common/AllFonts',
 | 
			
		||||
        sdk             : '../../sdkjs/word/sdk-all-min',
 | 
			
		||||
        api             : 'api/documents/api',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -46,7 +46,7 @@ require.config({
 | 
			
		|||
        perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
 | 
			
		||||
        jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
 | 
			
		||||
        xregexp         : '../vendor/xregexp/xregexp-all-min',
 | 
			
		||||
        socketio        : '../vendor/socketio/socket.io.min.js',
 | 
			
		||||
        socketio        : '../vendor/socketio/socket.io.min',
 | 
			
		||||
        api             : 'api/documents/api',
 | 
			
		||||
        core            : 'common/main/lib/core/application',
 | 
			
		||||
        notification    : 'common/main/lib/core/NotificationCenter',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -53,7 +53,7 @@ require.config({
 | 
			
		|||
        perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
 | 
			
		||||
        jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
 | 
			
		||||
        xregexp         : '../vendor/xregexp/xregexp-all-min',
 | 
			
		||||
        socketio        : '../vendor/socketio/socket.io.min.js',
 | 
			
		||||
        socketio        : '../vendor/socketio/socket.io.min',
 | 
			
		||||
        allfonts        : '../../sdkjs/common/AllFonts',
 | 
			
		||||
        sdk             : '../../sdkjs/word/sdk-all-min',
 | 
			
		||||
        api             : 'api/documents/api',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -53,7 +53,7 @@ require.config({
 | 
			
		|||
        perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
 | 
			
		||||
        jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
 | 
			
		||||
        xregexp         : '../vendor/xregexp/xregexp-all-min',
 | 
			
		||||
        socketio        : '../vendor/socketio/socket.io.min.js',
 | 
			
		||||
        socketio        : '../vendor/socketio/socket.io.min',
 | 
			
		||||
        api             : 'api/documents/api',
 | 
			
		||||
        core            : 'common/main/lib/core/application',
 | 
			
		||||
        notification    : 'common/main/lib/core/NotificationCenter',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -53,7 +53,7 @@ require.config({
 | 
			
		|||
        perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
 | 
			
		||||
        jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
 | 
			
		||||
        xregexp         : '../vendor/xregexp/xregexp-all-min',
 | 
			
		||||
        socketio        : '../vendor/socketio/socket.io.min.js',
 | 
			
		||||
        socketio        : '../vendor/socketio/socket.io.min',
 | 
			
		||||
        allfonts        : '../../sdkjs/common/AllFonts',
 | 
			
		||||
        sdk             : '../../sdkjs/slide/sdk-all-min',
 | 
			
		||||
        api             : 'api/documents/api',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -48,7 +48,7 @@ require.config({
 | 
			
		|||
        jquery          : '../vendor/jquery/jquery.min',
 | 
			
		||||
        underscore      : '../vendor/underscore/underscore-min',
 | 
			
		||||
        xregexp         : '../vendor/xregexp/xregexp-all-min',
 | 
			
		||||
        socketio        : '../vendor/socketio/socket.io.min.js',
 | 
			
		||||
        socketio        : '../vendor/socketio/socket.io.min',
 | 
			
		||||
        allfonts        : '../../sdkjs/common/AllFonts',
 | 
			
		||||
        sdk             : '../../sdkjs/slide/sdk-all-min'
 | 
			
		||||
    },
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -53,7 +53,7 @@ require.config({
 | 
			
		|||
        perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
 | 
			
		||||
        jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
 | 
			
		||||
        xregexp         : '../vendor/xregexp/xregexp-all-min',
 | 
			
		||||
        socketio        : '../vendor/socketio/socket.io.min.js',
 | 
			
		||||
        socketio        : '../vendor/socketio/socket.io.min',
 | 
			
		||||
        api             : 'api/documents/api',
 | 
			
		||||
        core            : 'common/main/lib/core/application',
 | 
			
		||||
        notification    : 'common/main/lib/core/NotificationCenter',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -48,7 +48,7 @@ require.config({
 | 
			
		|||
        jquery          : '../vendor/jquery/jquery',
 | 
			
		||||
        underscore      : '../vendor/underscore/underscore',
 | 
			
		||||
        xregexp         : '../vendor/xregexp/xregexp-all-min',
 | 
			
		||||
        socketio        : '../vendor/socketio/socket.io.min.js',
 | 
			
		||||
        socketio        : '../vendor/socketio/socket.io.min',
 | 
			
		||||
        allfonts        : '../../sdkjs/common/AllFonts'
 | 
			
		||||
    },
 | 
			
		||||
    shim: {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -53,7 +53,7 @@ require.config({
 | 
			
		|||
        perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
 | 
			
		||||
        jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
 | 
			
		||||
        xregexp         : '../vendor/xregexp/xregexp-all-min',
 | 
			
		||||
        socketio        : '../vendor/socketio/socket.io.min.js',
 | 
			
		||||
        socketio        : '../vendor/socketio/socket.io.min',
 | 
			
		||||
        allfonts        : '../../sdkjs/common/AllFonts',
 | 
			
		||||
        sdk             : '../../sdkjs/cell/sdk-all-min',
 | 
			
		||||
        api             : 'api/documents/api',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -53,7 +53,7 @@ require.config({
 | 
			
		|||
        perfectscrollbar: 'common/main/lib/mods/perfect-scrollbar',
 | 
			
		||||
        jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
 | 
			
		||||
        xregexp         : '../vendor/xregexp/xregexp-all-min',
 | 
			
		||||
        socketio        : '../vendor/socketio/socket.io.min.js',
 | 
			
		||||
        socketio        : '../vendor/socketio/socket.io.min',
 | 
			
		||||
        api             : 'api/documents/api',
 | 
			
		||||
        core            : 'common/main/lib/core/application',
 | 
			
		||||
        notification    : 'common/main/lib/core/NotificationCenter',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -281,7 +281,7 @@ module.exports = function(grunt) {
 | 
			
		|||
            },
 | 
			
		||||
        }
 | 
			
		||||
    });
 | 
			
		||||
    doRegisterTask('sockjs');
 | 
			
		||||
    doRegisterTask('socketio');
 | 
			
		||||
    doRegisterTask('xregexp');
 | 
			
		||||
    doRegisterTask('megapixel');
 | 
			
		||||
    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-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-megapixel',              ['megapixel-init', 'clean', 'copy']);
 | 
			
		||||
    grunt.registerTask('deploy-jquery',                 ['jquery-init', 'clean', 'copy']);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -32,7 +32,7 @@
 | 
			
		|||
                        "perfectscrollbar": "common/main/lib/mods/perfect-scrollbar",
 | 
			
		||||
                        "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
 | 
			
		||||
                        "xregexp": "empty:",
 | 
			
		||||
                        "sockjs": "empty:",
 | 
			
		||||
                        "socketio": "empty:",
 | 
			
		||||
                        "coapisettings": "empty:",
 | 
			
		||||
                        "allfonts": "empty:",
 | 
			
		||||
                        "sdk": "empty:",
 | 
			
		||||
| 
						 | 
				
			
			@ -85,7 +85,7 @@
 | 
			
		|||
                                "coapisettings",
 | 
			
		||||
                                "allfonts",
 | 
			
		||||
                                "xregexp",
 | 
			
		||||
                                "sockjs"
 | 
			
		||||
                                "socketio"
 | 
			
		||||
                            ]
 | 
			
		||||
                        },
 | 
			
		||||
                        "gateway": {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,7 +10,7 @@
 | 
			
		|||
    "requirejs-text": "~2.0.5",
 | 
			
		||||
    "less": "~1.5.0",
 | 
			
		||||
    "bootstrap": "~3.0.3",
 | 
			
		||||
    "sockjs": "~0.3.2",
 | 
			
		||||
    "socketio": "~4.5.3",
 | 
			
		||||
    "perfect-scrollbar": "latest"
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -180,14 +180,14 @@
 | 
			
		|||
            }
 | 
			
		||||
        }
 | 
			
		||||
    },
 | 
			
		||||
    "sockjs": {
 | 
			
		||||
    "socketio": {
 | 
			
		||||
        "clean": [
 | 
			
		||||
            "../deploy/web-apps/vendor/sockjs"
 | 
			
		||||
            "../deploy/web-apps/vendor/socketio"
 | 
			
		||||
        ],
 | 
			
		||||
        "copy": {
 | 
			
		||||
            "script": {
 | 
			
		||||
                "src": "../vendor/sockjs/sockjs.min.js",
 | 
			
		||||
                "dest": "../deploy/web-apps/vendor/sockjs/sockjs.min.js"
 | 
			
		||||
                "src": "../vendor/socketio/socket.io.min.js",
 | 
			
		||||
                "dest": "../deploy/web-apps/vendor/socketio/socket.io.min.js"
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    },
 | 
			
		||||
| 
						 | 
				
			
			@ -272,7 +272,7 @@
 | 
			
		|||
            "deploy-api",
 | 
			
		||||
            "deploy-apps-common",
 | 
			
		||||
            "deploy-sdk",
 | 
			
		||||
            "deploy-sockjs",
 | 
			
		||||
            "deploy-socketio",
 | 
			
		||||
            "deploy-xregexp",
 | 
			
		||||
            "deploy-requirejs",
 | 
			
		||||
            "deploy-megapixel",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -30,7 +30,7 @@
 | 
			
		|||
                        "perfectscrollbar": "common/main/lib/mods/perfect-scrollbar",
 | 
			
		||||
                        "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
 | 
			
		||||
                        "xregexp": "empty:",
 | 
			
		||||
                        "sockjs": "empty:",
 | 
			
		||||
                        "socketio": "empty:",
 | 
			
		||||
                        "coapisettings": "empty:",
 | 
			
		||||
                        "allfonts": "empty:",
 | 
			
		||||
                        "sdk": "empty:",
 | 
			
		||||
| 
						 | 
				
			
			@ -83,7 +83,7 @@
 | 
			
		|||
                                "coapisettings",
 | 
			
		||||
                                "allfonts",
 | 
			
		||||
                                "xregexp",
 | 
			
		||||
                                "sockjs"
 | 
			
		||||
                                "socketio"
 | 
			
		||||
                            ]
 | 
			
		||||
                        },
 | 
			
		||||
                        "gateway": {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -30,7 +30,7 @@
 | 
			
		|||
                        "perfectscrollbar": "common/main/lib/mods/perfect-scrollbar",
 | 
			
		||||
                        "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
 | 
			
		||||
                        "xregexp": "empty:",
 | 
			
		||||
                        "sockjs": "empty:",
 | 
			
		||||
                        "socketio": "empty:",
 | 
			
		||||
                        "coapisettings": "empty:",
 | 
			
		||||
                        "allfonts": "empty:",
 | 
			
		||||
                        "sdk": "empty:",
 | 
			
		||||
| 
						 | 
				
			
			@ -83,7 +83,7 @@
 | 
			
		|||
                                "coapisettings",
 | 
			
		||||
                                "allfonts",
 | 
			
		||||
                                "xregexp",
 | 
			
		||||
                                "sockjs"
 | 
			
		||||
                                "socketio"
 | 
			
		||||
                            ]
 | 
			
		||||
                        },
 | 
			
		||||
                        "gateway": {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -30,7 +30,7 @@
 | 
			
		|||
                        "perfectscrollbar": "common/main/lib/mods/perfect-scrollbar",
 | 
			
		||||
                        "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
 | 
			
		||||
                        "xregexp": "empty:",
 | 
			
		||||
                        "sockjs": "empty:",
 | 
			
		||||
                        "socketio": "empty:",
 | 
			
		||||
                        "coapisettings": "empty:",
 | 
			
		||||
                        "allfonts": "empty:",
 | 
			
		||||
                        "sdk": "empty:",
 | 
			
		||||
| 
						 | 
				
			
			@ -83,7 +83,7 @@
 | 
			
		|||
                                "coapisettings",
 | 
			
		||||
                                "allfonts",
 | 
			
		||||
                                "xregexp",
 | 
			
		||||
                                "sockjs"
 | 
			
		||||
                                "socketio"
 | 
			
		||||
                            ]
 | 
			
		||||
                        },
 | 
			
		||||
                        "gateway": {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -77,7 +77,7 @@
 | 
			
		|||
      <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/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 src="../../../vendor/requirejs/require.js"></script>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -147,7 +147,7 @@
 | 
			
		|||
<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/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 src="../../../vendor/requirejs/require.js"></script>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -113,7 +113,7 @@
 | 
			
		|||
        <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/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/xregexp/xregexp-all-min.js"></script>
 | 
			
		||||
        <script src="../../../vendor/requirejs/require.js"></script>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue