Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

maintenance for master branch (v1.0.2) #26

Closed
wants to merge 4 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ Ext.ux.data.proxy.WebSocket is an easy-to-use implementation of the ExtJS/Sencha

## ExtJS 5
The new version of ExtJS 5 has requested to make a new major version of `Ext.ux.data.proxy.WebSocket`.
Now, this new major version **v1.0.0** is located on the master branch.
Now, this new major version **v1.0.2** is located on the master branch.

## ExtJS 4 & Sencha Touch 2
It's possible to work either with ExtJS 4 and Sencha Touch 2 with previous version **v0.0.7**
@@ -165,7 +165,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 <wilk3ert@gmail.com>
Copyright (c) 2015 Vincenzo Ferrari <wilk3ert@gmail.com>

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:

9 changes: 2 additions & 7 deletions WebSocket.js
Original file line number Diff line number Diff line change
@@ -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
@@ -259,6 +252,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!');
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Ext.ux.data.proxy.WebSocket",
"version": "1.0.1",
"version": "1.0.2",
"homepage": "https://github.com/wilk/Ext.ux.data.proxy.WebSocket",
"authors": [
"Vincenzo (Wilk) Ferrari <wilk3ert@gmail.com>"
@@ -31,6 +31,6 @@
"Gruntfile.js"
],
"dependencies": {
"ext.ux.websocket": "~1.0.0"
"ext.ux.websocket": "~1.0.1"
}
}
8 changes: 4 additions & 4 deletions demo/index.html
Original file line number Diff line number Diff line change
@@ -3,10 +3,10 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>Ext.ux.data.proxy.WebSocket</title>
<script src="http://cdn.sencha.com/ext/gpl/5.0.1/build/ext-all-debug.js"></script>
<script src="http://cdn.sencha.com/ext/gpl/5.0.1/packages/sencha-charts/build/sencha-charts-debug.js"></script>
<link rel="stylesheet" type="text/css" href="http://cdn.sencha.com/ext/gpl/5.0.1/packages/ext-theme-crisp/build/resources/ext-theme-crisp-all-debug.css"/>
<script src="http://cdn.sencha.com/ext/gpl/5.0.1/packages/ext-theme-crisp/build/ext-theme-crisp-debug.js"></script>
<script src="http://cdn.sencha.com/ext/gpl/5.1.0/build/ext-all-debug.js"></script>
<script src="http://cdn.sencha.com/ext/gpl/5.1.0/packages/sencha-charts/build/sencha-charts-debug.js"></script>
<link rel="stylesheet" type="text/css" href="http://cdn.sencha.com/ext/gpl/5.1.0/packages/ext-theme-crisp/build/resources/ext-theme-crisp-all-debug.css"/>
<script src="http://cdn.sencha.com/ext/gpl/5.1.0/packages/ext-theme-crisp/build/ext-theme-crisp-debug.js"></script>

<script src="demo.js"></script>
</head>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Ext.ux.data.proxy.WebSocket",
"version": "0.0.0",
"version": "1.0.2",
"description": "An easy-to-use implementation of the ExtJS/Sencha Touch proxy, using HTML5 WebSocket",
"main": "WebSocket.js",
"scripts": {