masq
/
glowing-bear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #110 from lorenzhs/compression 

Making compression optional was a stupid idea. Revert.
This commit is contained in:
David Cormier 2014-01-06 08:37:57 -08:00
parent 3b2af82d36 cd6362c70e
commit a6181df7e6
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
3rdparty/inflate.min.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

6
index.html
View File

@ -72,12 +72,6 @@
Encryption. Read instructions for help Encryption. Read instructions for help
</label> </label>
</div> </div>
<div class="checkbox">
<label class="control-label " for="compression">
<input type="checkbox" class="" id="compression" ng-model="compression">
Compress communication with relay
</label>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label" for="port">Lines</label> <label class="control-label" for="port">Lines</label>

7
js/websockets.js
View File

@ -276,7 +276,7 @@ weechat.factory('connection', ['$q', '$rootScope', '$log', '$store', 'handlers',
}; };
// Takes care of the connection and websocket hooks // Takes care of the connection and websocket hooks
var connect = function (host, port, passwd, ssl, compression) { var connect = function (host, port, passwd, ssl, noCompression) {
var proto = ssl ? 'wss':'ws'; var proto = ssl ? 'wss':'ws';
websocket = new WebSocket(proto+"://" + host + ':' + port + "/weechat"); websocket = new WebSocket(proto+"://" + host + ':' + port + "/weechat");
websocket.binaryType = "arraybuffer"; websocket.binaryType = "arraybuffer";
@ -291,7 +291,7 @@ weechat.factory('connection', ['$q', '$rootScope', '$log', '$store', 'handlers',
sendAll([ sendAll([
weeChat.Protocol.formatInit({ weeChat.Protocol.formatInit({
password: passwd, password: passwd,
compression: compression ? 'zlib' : 'off' compression: noCompression ? 'off' : 'zlib'
}), }),
weeChat.Protocol.formatInfo({ weeChat.Protocol.formatInfo({
@ -532,7 +532,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
$store.bind($scope, "port", "9001"); $store.bind($scope, "port", "9001");
$store.bind($scope, "proto", "weechat"); $store.bind($scope, "proto", "weechat");
$store.bind($scope, "ssl", false); $store.bind($scope, "ssl", false);
$store.bind($scope, "compression", false);
$store.bind($scope, "lines", "40"); $store.bind($scope, "lines", "40");
$store.bind($scope, "savepassword", false); $store.bind($scope, "savepassword", false);
if($scope.savepassword) { if($scope.savepassword) {
@ -601,7 +600,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
$scope.connect = function() { $scope.connect = function() {
connection.connect($scope.host, $scope.port, $scope.password, $scope.ssl, $scope.compression); connection.connect($scope.host, $scope.port, $scope.password, $scope.ssl);
}; };
$scope.disconnect = function() { $scope.disconnect = function() {
connection.disconnect(); connection.disconnect();

2
js/weechat.js
View File

@ -630,7 +630,7 @@
WeeChatProtocol.formatInit = function(params) { WeeChatProtocol.formatInit = function(params) {
var defaultParams = { var defaultParams = {
password: null, password: null,
compression: 'off' compression: 'zlib'
}; };
var keys = []; var keys = [];
var parts = []; var parts = [];