From c7846d3b1f4b8f419f248f466e283c589fc428e2 Mon Sep 17 00:00:00 2001 From: Telepenin Nikolay Date: Mon, 8 Sep 2014 19:49:54 +0400 Subject: [PATCH 1/3] Update WebSocket.js Issue #21 --- WebSocket.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/WebSocket.js b/WebSocket.js index c64a4b2..54c0053 100644 --- a/WebSocket.js +++ b/WebSocket.js @@ -58,13 +58,6 @@ Ext.define('Ext.ux.data.proxy.WebSocket', { requires: ['Ext.ux.WebSocket'], - /** - * @property {Object} callbacks - * @private - * Callbacks stack - */ - callbacks: {}, - config: { /** * @cfg {String} storeId (required) Id of the store associated @@ -180,6 +173,8 @@ Ext.define('Ext.ux.data.proxy.WebSocket', { constructor: function (cfg) { var me = this; + me.callbacks = Ext.apply(cfg.callbacks || {}, {}); + // Requires a configuration if (Ext.isEmpty(cfg)) { Ext.Error.raise('A configuration is needed!'); From 4249e01fd1d014a2e765db3f9cfe06b31521438c Mon Sep 17 00:00:00 2001 From: Richard van Dijk Date: Tue, 29 Sep 2015 01:11:30 +0200 Subject: [PATCH 2/3] update demo to Ext JS 4.2.1 --- demo/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/index.html b/demo/index.html index 7439fe5..d6e53e1 100644 --- a/demo/index.html +++ b/demo/index.html @@ -3,8 +3,8 @@ Ext.ux.data.proxy.WebSocket - - + + From eeb00cc785efac41bf8abaf38e876138c97a8776 Mon Sep 17 00:00:00 2001 From: Richard van Dijk Date: Tue, 29 Sep 2015 01:13:25 +0200 Subject: [PATCH 3/3] bump version to v0.0.8 And update dependency on ext.ux.websocket to v0.0.6. --- README.md | 2 +- bower.json | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8410ef5..a9046b5 100644 --- a/README.md +++ b/README.md @@ -152,7 +152,7 @@ It will make the documentation into docs dir and it will be visible at: http://l ## License The MIT License (MIT) -Copyright (c) 2013 Vincenzo Ferrari +Copyright (c) 2015 Vincenzo Ferrari Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/bower.json b/bower.json index b046efd..711d462 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "Ext.ux.data.proxy.WebSocket", - "version": "0.0.7", + "version": "0.0.8", "homepage": "https://github.com/wilk/Ext.ux.data.proxy.WebSocket", "authors": [ "Vincenzo (Wilk) Ferrari " @@ -31,6 +31,6 @@ "Gruntfile.js" ], "dependencies": { - "ext.ux.websocket": "~0.0.4" + "ext.ux.websocket": "~0.0.6" } } diff --git a/package.json b/package.json index 948d277..65a11d4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Ext.ux.data.proxy.WebSocket", - "version": "0.0.0", + "version": "0.0.8", "description": "An easy-to-use implementation of the ExtJS/Sencha Touch proxy, using HTML5 WebSocket", "main": "WebSocket.js", "scripts": {