Commit 53ae442c authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix bug 33820

parent aab5c6d5
...@@ -918,8 +918,7 @@ ...@@ -918,8 +918,7 @@
case 80: // print Ctrl + p case 80: // print Ctrl + p
if (t.handlers.trigger("getCellEditMode")) { if (t.handlers.trigger("getCellEditMode")) {
stop(); return true;
return result;
} }
if (!ctrlKey) { if (!ctrlKey) {
......
...@@ -1397,15 +1397,16 @@ ...@@ -1397,15 +1397,16 @@
DocsCoApi.prototype._initSocksJs = function() { DocsCoApi.prototype._initSocksJs = function() {
var t = this; var t = this;
var sockjs;
if (window['IS_NATIVE_EDITOR']) { if (window['IS_NATIVE_EDITOR']) {
var sockjs = this.sockjs = window['SockJS']; sockjs = this.sockjs = window['SockJS'];
sockjs.open(); sockjs.open();
return sockjs; return sockjs;
} else { } else {
//ограничиваем transports WebSocket и XHR / JSONP polling, как и engine.io https://github.com/socketio/engine.io //ограничиваем transports WebSocket и XHR / JSONP polling, как и engine.io https://github.com/socketio/engine.io
//при переборе streaming transports у клиента с wirewall происходило зацикливание(не повторялось в версии sock.js 0.3.4) //при переборе streaming transports у клиента с wirewall происходило зацикливание(не повторялось в версии sock.js 0.3.4)
var sockjs = this.sockjs = new (this._getSockJs())(this.sockjs_url, null, {transports: ['websocket', 'xdr-polling', 'xhr-polling', 'iframe-xhr-polling', 'jsonp-polling']}); sockjs = this.sockjs = new (this._getSockJs())(this.sockjs_url, null, {transports: ['websocket', 'xdr-polling', 'xhr-polling', 'iframe-xhr-polling', 'jsonp-polling']});
} }
sockjs.onopen = function() { sockjs.onopen = function() {
......
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