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.

Sign up for GitHub

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 ext4 branch (v0.0.8) #27

Closed
wants to merge 3 commits into from
Closed

maintenance for ext4 branch (v0.0.8) #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7846d3
Update WebSocket.js
telepenin Sep 8, 2014
4249e01
update demo to Ext JS 4.2.1
Sep 28, 2015
eeb00cc
bump version to v0.0.8
Sep 28, 2015
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
Copyright (c) 2015 Vincenzo Ferrari <[email protected]>

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:

Expand Down
9 changes: 2 additions & 7 deletions WebSocket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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!');
Expand Down
4 changes: 2 additions & 2 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"
Expand Down Expand Up @@ -31,6 +31,6 @@
"Gruntfile.js"
],
"dependencies": {
"ext.ux.websocket": "~0.0.4"
"ext.ux.websocket": "~0.0.6"
}
}
4 changes: 2 additions & 2 deletions demo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>Ext.ux.data.proxy.WebSocket</title>
<link rel="stylesheet" type="text/css" href="http://cdn.sencha.com/ext-4.2.0-gpl/resources/css/ext-all.css"/>
<script src="http://cdn.sencha.com/ext-4.2.0-gpl/ext-all.js"></script>
<link rel="stylesheet" type="text/css" href="http://cdnjs.cloudflare.com/ajax/libs/extjs/4.2.1/resources/css/ext-all-debug.css"/>
<script src="http://cdnjs.cloudflare.com/ajax/libs/extjs/4.2.1/ext-all-debug.js"> </script>
<script src="demo.js"></script>
</head>
</html>
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
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": "0.0.8",
"description": "An easy-to-use implementation of the ExtJS/Sencha Touch proxy, using HTML5 WebSocket",
"main": "WebSocket.js",
"scripts": {
Expand Down