Skip to content
This repository has been archived by the owner on Jul 6, 2021. It is now read-only.

Commit

Permalink
Microrefactoring + added refreshing by socket
Browse files Browse the repository at this point in the history
  • Loading branch information
@artemkonenko
artemkonenko committed Feb 3, 2013
1 parent 6c6b193 commit 2f90de7
Show file tree
Hide file tree
Showing 4 changed files with 153 additions and 80 deletions.
2 changes: 1 addition & 1 deletion browser_plugins/opera/config.xml
View file
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<widget xmlns="http://www.w3.org/ns/widgets"
id="https://github.com/PhilippSchaffrath/LiveRefresh"
version="0.4">
version="0.5">
<name>LiveRefresh</name>
<description>Lets you independently connect your tabs to WebSocket-Server. Each time, a tab received "refresh" it will focus and refresh.</description>
<author href="http://github.com/yadummer" email="yadummer@gmail.com">Konenko [yadummer] Artem</author>
Expand Down
143 changes: 91 additions & 52 deletions browser_plugins/opera/js/background.js
View file
Expand Up @@ -3,77 +3,120 @@
var background =
{
button: null // Widget button
, tabs: new Array() // Associative array tab <-> open socket.
, tabs: new Array() // tabId -> tab:BrowserTab, socket:WebSocket, host, port
, Init: function()
{
window.addEventListener("load", this.onLoad(), false); // Constructor for the widget
}
, onLoad: function()
{
var self = this; // The crutche for access to object into anonymous function.
var self = this; // The crutch for access to object into anonymous function.

var ToolbarUIItemProperties =
{
title: "LiveRefresh",
icon: "img/icon.png",
popup: {
href: "popup.html",
width: 400,
height: 40
},
badge: {
display: "block",
textContent: "12",
color: "white",
backgroundColor: "rgba(211, 0, 4, 1)"
}
};
title: "LiveRefreshDev"
, icon: "img/icon.png"
, popup: {
href: "popup.html",
width: 400,
height: 40
}
};
this.button = opera.contexts.toolbar.createItem(ToolbarUIItemProperties);
opera.contexts.toolbar.addItem(this.button);

opera.extension.tabs.onfocus = function() { self.onFocus(); };
opera.extension.onconnect = function(event)
{
var tabId = opera.extension.tabs.getFocused().id;
var status = self.tabs[tabId] != undefined;
// It's magic, but our extension drops, when we try used host and port fields
// I will try fix it in next iteration
var host = 'Localhost'; // self.tabs[tabId].host;
var port = 1025; // self.tabs[tabId].port;

event.source.postMessage( {
'tabId': tabId
, 'status': status
, 'host': host
, 'port': port
} );
}

opera.extension.onmessage = function(event) { self.onMessage(event); };
}
, onFocus: function () // Handler for changing the active tab
{
if ( this.tabs[opera.extension.tabs.getFocused().id] != undefined )
{
this.updateIcon('active');
this.updateIcon('active');
}
else
{
this.updateIcon('passive');
}
}
, onMessage: function(event)
{
//url = event.data;
}
, connect: function(host, port)
{
var self = this; // The crutche for access to object into anonymous function.
var tabId = opera.extension.tabs.getFocused().id;
, onMessage: function(event)
{
var action = event.data.action;
var tabId = opera.extension.tabs.getFocused().id;

if (host.length == 0)
{
host = 'localhost';
}
if (port.length == 0)
{
port = '1025';
if ( action == 'connect' )
{
var host = event.data.host;
var port = event.data.port;

if (host.length == 0)
{
host = 'localhost';
}
if (port.length == 0)
{
port = '1025';
}

this.connect(host, port, tabId);
}
else if ( action == 'disconnect' )
{
this.disconnect(tabId);
}

}
, connect: function(host, port, tabId)
{
var self = this; // The crutche for access to object into anonymous function.

this.tabs[tabId] = new WebSocket('ws://' + host + ':' + port);
this.tabs[tabId].onopen = function () { opera.postError('onopen'); self.onSocketOpen(); };
this.tabs[tabId].onclose = function(event) { opera.postError('onclose'); self.onSocketClose(event); };
this.tabs[tabId].onmessage = function(event) { opera.postError('onmessage'); self.onSocketMessage(event); };
this.tabs[tabId].onerror = function(event) { opera.postError('onerror'); self.onSocketError(event); };
this.tabs[tabId] = {
'tab': opera.extension.tabs.getFocused()
, 'socket': new WebSocket('ws://' + host + ':' + port)
, 'host': host
, 'port': port
}

//return opera.extension.tabs.getFocused();
this.tabs[tabId].socket.onopen = function () { self.onSocketOpen(); };
this.tabs[tabId].socket.onclose = function(event) { self.onSocketClose(event); };
this.tabs[tabId].socket.onmessage = function(event)
{
self.onSocketMessage( event,
function ()
{
self.tabs[tabId].tab.refresh();
}
);
};
this.tabs[tabId].socket.onerror = function(event) { self.onSocketError(event); };
}
, onSocketOpen: function ()
{
this.updateIcon('active');
, disconnect: function(tabId)
{
this.tabs[tabId].socket.onclose = function(event) {};
this.tabs[tabId].socket.close();
this.tabs[tabId] = null;
this.updateIcon('passive');
}
, onSocketOpen: function ()
{
this.updateIcon('active');
}
, onSocketClose: function (event)
{
Expand All @@ -82,30 +125,26 @@ var background =
} else {
// Break connection
}
this.button.badge.textContent = 'close';
opera.postError('Socket closed');
}
, onSocketMessage: function (event)
, onSocketMessage: function (event, refresh)
{
this.button.badge.textContent = Math.random();
refresh();
}
, onSocketError: function (error)
{
// We have the problem, but I don't know what we should do :(
this.button.badge.textContent = 'Error';
opera.postError('Error');
}
, disconnect: function()
{
this.updateIcon('passive');
}
, updateIcon: function (type)
, updateIcon: function (type)
{
if (type == 'active')
{
this.button.icon = "img/icon_active.png";
} else {
this.button.icon = "img/icon.png";
this.button.icon = "img/icon.png";
}
}
}
};

background.Init();
86 changes: 60 additions & 26 deletions browser_plugins/opera/js/plugin.js
View file
@@ -1,27 +1,61 @@
$(document).ready(function() {
var background, connectButton, disconnectButton, hostField, portField;
background = opera.extension.bgProcess.background;
hostField = $('form#socketform #host');
portField = $('form#socketform #port');
connectButton = $('form#socketform #connect');
disconnectButton = $('form#socketform #disconnect');

connectButton.on("click", function(e) {
e.preventDefault();
if ($(e.target).hasClass("disabled")) {
return;
}
background.connect(hostField.val(), portField.val());

return window.close();
});

disconnectButton.on("click", function(e) {
e.preventDefault();
if ($(e.target).hasClass("disabled")) {
return;
}
background.disconnect();
return window.close();
});
});
var source;
var self = this;

var hostField = $('form#socketform #host');
var portField = $('form#socketform #port');
var connectButton = $('form#socketform #connect');
var disconnectButton = $('form#socketform #disconnect');

var update = function( status, host, port )
{
if ( status == true )
{
connectButton.addClass('disabled');
disconnectButton.removeClass('disabled');
}
else
{
connectButton.removeClass('disabled');
disconnectButton.addClass('disabled');
}

hostField.attr( 'placeholder', host );
portField.attr( 'placeholder', port );
}

opera.extension.onmessage = function(event)
{
source = event.source;

update( event.data.status, event.data.host, event.data.port );
}

connectButton.on("click",
function(e)
{
e.preventDefault();
if ($(e.target).hasClass("disabled")) { return; }

source.postMessage( {
'action': 'connect'
, 'host': hostField.val()
, 'port': portField.val()
} );

return window.close();
});

disconnectButton.on("click",
function(e)
{
e.preventDefault();
if ($(e.target).hasClass("disabled")) { return; }

source.postMessage( {
'action': 'disconnect'
} );

return window.close();
});
});
2 changes: 1 addition & 1 deletion browser_plugins/opera/popup.html
View file
Expand Up @@ -22,7 +22,7 @@
<input class="span1" type="text" id="port" placeholder="Port"/>

<button class="btn btn-primary" type="submit" id="connect">Connect</button>
<button class="btn disabled" type="submit" id="disconnect">Disconnect</button>
<button class="btn" type="submit" id="disconnect">Disconnect</button>
</div>
</form>
</body>
Expand Down

0 comments on commit 2f90de7

Please sign in to comment.