From 9545e9b89f465b35888a74057944fe7df2457095 Mon Sep 17 00:00:00 2001 From: Richard van Dijk Date: Sun, 27 Sep 2015 17:02:32 +0200 Subject: [PATCH 1/4] update to Ext JS 4.2.1 --- bower.json | 2 +- demo/index.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bower.json b/bower.json index c1bc98e..e36916e 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "Ext.ux.WebSocket", - "version": "0.0.4", + "version": "v0.0.6", "homepage": "https://github.com/wilk/ExtJS-WebSocket", "authors": [ "Vincenzo (Wilk) Ferrari " diff --git a/demo/index.html b/demo/index.html index 3d812f5..df65a6e 100644 --- a/demo/index.html +++ b/demo/index.html @@ -3,8 +3,8 @@ ExtJS WebSocket - - + + From 9d4558ca1f0e11100f926368d0af6e80ab77d52c Mon Sep 17 00:00:00 2001 From: Telepenin Nikolay Date: Mon, 8 Sep 2014 19:52:16 +0400 Subject: [PATCH 2/4] Update WebSocket.js For [Issue](https://github.com/wilk/Ext.ux.data.proxy.WebSocket/issues/21) --- WebSocket.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/WebSocket.js b/WebSocket.js index 00ae269..d58b36d 100644 --- a/WebSocket.js +++ b/WebSocket.js @@ -195,6 +195,8 @@ Ext.define('Ext.ux.WebSocket', { constructor: function (cfg) { var me = this; + me.messageQueue = (cfg.messageQueue || []).slice(); + // Raises an error if no url is given if (Ext.isEmpty(cfg)) { Ext.Error.raise('URL for the websocket is required!'); From a99853ac9342c1cc3f3332a73af7a161248590b9 Mon Sep 17 00:00:00 2001 From: Richard van Dijk Date: Mon, 28 Sep 2015 14:51:09 +0200 Subject: [PATCH 3/4] stop using websocket URL as panel id (fix wilk/ExtJS-WebSocket#12) It is incompatible with later versions of Ext JS. --- demo/demo.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/demo/demo.js b/demo/demo.js index 176c590..5568707 100644 --- a/demo/demo.js +++ b/demo/demo.js @@ -22,13 +22,17 @@ Ext.define ('DEMO.view.OpenConnection', { url: url , listeners: { open: function (ws) { - if (Ext.get(ws.url)) Ext.get(ws.url).dom.innerHTML += '> WebSocket just open!
'; + var container = Ext.ComponentQuery.query('panel[title="' + url + '"] > container#messageCt')[0]; + var messageBox = container.getEl().dom.getElementsByClassName("messageBox")[0]; + messageBox.innerHTML += '> WebSocket just open!
'; } , message: function (ws, data) { - Ext.get(ws.url).dom.innerHTML += '> ' + data + '
'; + var container = Ext.ComponentQuery.query('panel[title="' + url + '"] > container#messageCt')[0]; + var messageBox = container.getEl().dom.getElementsByClassName("messageBox")[0]; + messageBox.innerHTML += '> ' + data + '
'; } , close: function (ws) { - var panel = Ext.getCmp ('panel' + ws.url); + var panel = Ext.ComponentQuery.query('panel[title="' + url + '"]')[0]; if ((panel != null) || (panel != undefined)) { panel.destroy (); @@ -41,7 +45,6 @@ Ext.define ('DEMO.view.OpenConnection', { var panel = Ext.create ('Ext.panel.Panel', { title: url , ws: ws , - id: 'panel' + url , layout: 'anchor' , @@ -50,7 +53,8 @@ Ext.define ('DEMO.view.OpenConnection', { items: [{ xtype: 'container' , - html: 'Incoming from the server:
' + html: 'Incoming from the server:
' , + itemId: 'messageCt' } , { xtype: 'textarea' , labelAlign: 'top' , From dc4bd1d2c9481ba5497e8436d09b47cd55798d21 Mon Sep 17 00:00:00 2001 From: Richard van Dijk Date: Mon, 28 Sep 2015 14:52:41 +0200 Subject: [PATCH 4/4] scroll messages to bottom + fill in default websocket URL For convenience. --- demo/demo.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/demo/demo.js b/demo/demo.js index 5568707..2373369 100644 --- a/demo/demo.js +++ b/demo/demo.js @@ -30,6 +30,7 @@ Ext.define ('DEMO.view.OpenConnection', { var container = Ext.ComponentQuery.query('panel[title="' + url + '"] > container#messageCt')[0]; var messageBox = container.getEl().dom.getElementsByClassName("messageBox")[0]; messageBox.innerHTML += '> ' + data + '
'; + messageBox.scrollTop = messageBox.scrollHeight; } , close: function (ws) { var panel = Ext.ComponentQuery.query('panel[title="' + url + '"]')[0]; @@ -110,6 +111,7 @@ Ext.define ('DEMO.view.OpenConnection', { xtype: 'textfield' , anchor: '100%' , fieldLabel: 'URL' , + value: 'ws://localhost:9001' , labelAlign: 'top' , listeners: { specialKey: function (tf, evt) {