Cleaned up licensing info

tribeim · Dec 16, 2010 · c89cea1 · c89cea1
1 parent 97b6e3f
commit c89cea1
Show file tree

Hide file tree

Showing 30 changed files with 73 additions and 185 deletions.
diff --git a/app.html b/app.html
@@ -1,9 +1,4 @@
 <!DOCTYPE html>
-<!--
-	This file is part of Tribe.im
-	@author Copyright (c) 2010 Sebastiaan Deckers
-	@license GNU General Public License version 3 or later
--->
 <html x-manifest="app.manifest">
 	<head>
 		<meta charset="utf-8" />

diff --git a/core/app.js b/core/app.js
@@ -1,9 +1,4 @@
-/**
-	This file is part of Web Client
-	@author Copyright (c) 2010 Sebastiaan Deckers
-	@license GNU General Public License version 3 or later
-*/
-define(
+define(
 	[
 		"libraries/polyfill",
 		"core/events",

diff --git a/core/css.js b/core/css.js
@@ -1,9 +1,4 @@
-/**
-	This file is part of Web Client
-	@author Copyright (c) 2010 Sebastiaan Deckers
-	@license GNU General Public License version 3 or later
-*/
-define(function () {
+define(function () {
 	var baseTheme = "themes/base/";
 	var stylesheets = {};
 	return {

diff --git a/core/events.js b/core/events.js
@@ -1,9 +1,4 @@
-/**
-	This file is part of Web Client
-	@author Copyright (c) 2010 Sebastiaan Deckers
-	@license GNU General Public License version 3 or later
-*/
-define(function () {
+define(function () {
 	var callbacks = {};
 
 	var iterators = (function () {

diff --git a/core/loader.js b/core/loader.js
@@ -1,9 +1,4 @@
-/**
-	This file is part of Web Client
-	@author Copyright (c) 2010 Sebastiaan Deckers
-	@license GNU General Public License version 3 or later
-*/
-define(["core/events"], function (events) {
+define(["core/events"], function (events) {
 	events.subscribe("xmpp.connected", function () {
 		require(["core/loaderList"], function (loaderList) {
 			require(loaderList, function (module) {

diff --git a/core/loaderList.js b/core/loaderList.js
@@ -1,9 +1,4 @@
-/**
-	This file is part of Web Client
-	@author Copyright (c) 2010 Sebastiaan Deckers
-	@license GNU General Public License version 3 or later
-*/
-define(function () {return [
+define(function () {return [
 	"modules/help",
 	"modules/search",
 	"modules/twitterSearch",

diff --git a/core/paths.js b/core/paths.js
@@ -1,9 +1,4 @@
-/**
-	This file is part of Web Client
-	@author Copyright (c) 2010 Sebastiaan Deckers
-	@license GNU General Public License version 3 or later
-*/
-define(function () {
+define(function () {
 	var pathHandlers = [];
 
 	var method = "fragment"; // "fragment" or "history"

diff --git a/core/session.js b/core/session.js
@@ -1,9 +1,4 @@
-/**
-	This file is part of Web Client
-	@author Copyright (c) 2010 Sebastiaan Deckers
-	@license GNU General Public License version 3 or later
-*/
-define(["core/events", "core/settings", "core/css"], function (events, settings, css) {
+define(["core/events", "core/settings", "core/css"], function (events, settings, css) {
 	var $ = document.querySelector.bind(document);
 	var $$ = function () {return Array.prototype.slice.call(document.querySelectorAll.apply(document, arguments));};
 

diff --git a/core/settings.js b/core/settings.js
@@ -1,9 +1,4 @@
-/**
-	This file is part of Web Client
-	@author Copyright (c) 2010 Sebastiaan Deckers
-	@license GNU General Public License version 3 or later
-*/
-define(["core/events"], function (events) {
+define(["core/events"], function (events) {
 	var stubCopy = function (target, template) {
 		Object.keys(template).forEach(function (key) {
 			switch (typeof template[key]) {

diff --git a/core/xmpp.js b/core/xmpp.js
@@ -1,9 +1,4 @@
-/**
-	This file is part of Web Client
-	@author Copyright (c) 2010 Sebastiaan Deckers
-	@license GNU General Public License version 3 or later
-*/
-define(["core/events", "core/xpath"], function (events, xpath) {
+define(["core/events", "core/xpath"], function (events, xpath) {
 	/* Strophe instance */
 	var stropheConnection;
 

diff --git a/core/xpath.js b/core/xpath.js
@@ -1,8 +1,4 @@
-/*
-	Copyright (c) 2010 Sebastiaan Deckers
-	GNU General Public License version 3 or later
-*/
-/**	Package: xpath
+/**	Package: xpath
  *	Easy to use API for XML traversal with XPath.
  *
  *	Returns:

diff --git a/libraries/HTMLElement.js b/libraries/HTMLElement.js
@@ -1,10 +1,4 @@
-/**
-	This file is part of Web Client
-	@author Copyright (c) 2010 Sebastiaan Deckers
-	@license GNU General Public License version 3 or later
-*/
-
-// Making the HTMLElement.prototype writable in old Safari/KHTML.
+// Making the HTMLElement.prototype writable in old Safari/KHTML.
 // http://my.opera.com/_Grey_/blog/2007/04/21/safari-and-htmlelement-prototype
 (function () {
 	var t, w = window;

diff --git a/libraries/console.js b/libraries/console.js
@@ -1,9 +1,4 @@
-/**
-	This file is part of Web Client
-	@author Copyright (c) 2010 Sebastiaan Deckers
-	@license GNU General Public License version 3 or later
-*/
-if (!("console" in window)) {
+if (!("console" in window)) {
 	window.console = {};
 }
 

diff --git a/libraries/mustache.js b/libraries/mustache.js
@@ -1,8 +1,3 @@
-/**
-	This file is part of Web Client
-	@author Copyright (c) 2010 Sebastiaan Deckers
-	@license GNU General Public License version 3 or later
-*/
-define(["libraries/mustache_.js"], function () {
+define(["libraries/mustache_.js"], function () {
 	return Mustache;
 });
diff --git a/libraries/polyfill.js b/libraries/polyfill.js
@@ -1,9 +1,4 @@
-/**
-	This file is part of Web Client
-	@author Copyright (c) 2010 Sebastiaan Deckers
-	@license GNU General Public License version 3 or later
-*/
-define(
+define(
 	[
 		"libraries/global-es5.js",
 		"libraries/split.js",

diff --git a/license.txt b/license.txt
@@ -0,0 +1,12 @@
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/modules/help.js b/modules/help.js
@@ -1,9 +1,4 @@
-/**
-	This file is part of Web Client
-	@author Copyright (c) 2010 Sebastiaan Deckers
-	@license GNU General Public License version 3 or later
-*/
-define(["core/ui"], function (ui) {
+define(["core/ui"], function (ui) {
 	ui.addNavigation({
 		title: "Help",
 		url: "http://tribe.im/help"

diff --git a/modules/jidParser.js b/modules/jidParser.js
@@ -1,9 +1,4 @@
-/**
-	This file is part of Web Client
-	@author Copyright (c) 2010 Sebastiaan Deckers
-	@license GNU General Public License version 3 or later
-*/
-define(function () {
+define(function () {
 	var cache = {};
 
 	// TODO: Implement Stringprep

diff --git a/modules/roster.js b/modules/roster.js
@@ -1,23 +1,19 @@
-/*
-	Copyright (c) 2010 Sebastiaan Deckers
-	GNU General Public License version 3 or later
-*/
-/**	Package: roster
+/**	Package: roster
  *	Parsing and eventing for the XMPP roster data.
  *
  *	Returns:
  *		<RosterContacts>
  *
- *	Event: contacts.change
+ *	Event: roster.change
  *		One or more roster items have been updated.
  *
  *		Payload:
  *		(RosterContacts) changedContacts - Contains <RosterContacts> that have been modified.
  *
- *	Event: contacts.ready
+ *	Event: roster.ready
  *		The roster has been loaded.
  *
- *  Event: contacts.unavailable
+ *  Event: roster.unavailable
  *		A contact goes offline or becomes otherwise unavailable. All its resources are disconnected.
  *
  *		Payload:
@@ -26,7 +22,7 @@
  *		(String) resource - The resource of the contact.
  *		(Object) status - Contains the type and the resource's last message.
  *
- *	Event: contacts.available
+ *	Event: roster.available
  *		A contact's resource comes online or changes their availability.
  *
  *		Payload:
@@ -35,21 +31,21 @@
  *		(String) resource - The resource of the contact.
  *		(RosterResource) rosterResource - The parsed <RosterResource> object.
  *
- *	Event: contacts.subscribe
+ *	Event: roster.subscribe
  *
  *		Payload:
  *		(Element) presence - The <presence/> stanza.
  *		(String) jid - The bare address of the contact.
  *		(String) resource - The resource of the contact.
  *
- *	Event: contacts.subscribed
- *		See: <contacts.subscribe>
+ *	Event: roster.subscribed
+ *		See: <roster.subscribe>
  *
- *	Event: contacts.unsubscribe
- *		See: <contacts.subscribe>
+ *	Event: roster.unsubscribe
+ *		See: <roster.subscribe>
  *
- *	Event: contacts.unsubscribed
- *		See: <contacts.subscribe>
+ *	Event: roster.unsubscribed
+ *		See: <roster.subscribe>
  */
 define(
 ["core/events", "core/xmpp", "core/xpath", "modules/rosterCache", "modules/jidParser"],
@@ -120,19 +116,21 @@ function (events, xmpp, xpath, rosterCache, jidParser) {
 		}
 		xmpp.sendIQ(iq, function (iq) {
 			var oldContacts = roster.contacts;
+			var newRoster;
 			if (versioningSupported && !xpath(iq, "/client:iq/roster:query", Object, xmlns)) {
-				roster = rosterCache.load(xmpp.connection.jid.bare);
+				newRoster = rosterCache.load(xmpp.connection.jid.bare);
 			} else {
-				roster = parseRosterIQ(iq).roster;
-				rosterCache.save(xmpp.connection.jid.bare, roster);
+				newRoster = parseRosterIQ(iq).roster;
+				rosterCache.save(xmpp.connection.jid.bare, newRoster);
 			}
-			var changedContacts = compareContacts(oldContacts, roster.contacts);
+			var changedContacts = compareContacts(oldContacts, newRoster.contacts);
+			mergeRoster(roster, newRoster);
 			if (Object.keys(changedContacts).length > 0) {
-				events.publish("contacts.change", changedContacts);
+				events.publish("roster.change", changedContacts);
 			}
 			xmpp.subscribe(rosterIQHandler);
 			xmpp.subscribe(presenceHandler);
-			events.publish("contacts.ready");
+			events.publish("roster.ready");
 		});
 		events.subscribe("xmpp.disconnected", onDisconnected);
 	};
@@ -142,14 +140,24 @@ function (events, xmpp, xpath, rosterCache, jidParser) {
 			var contact = roster.contacts[jid];
 			Object.keys(contact.resources).forEach(function (resource) {
 				delete contact.resources[resource];
-				events.publish("contacts.unavailable", null, jid, resource, "");
+				events.publish("roster.unavailable", null, jid, resource, "");
 			});
 		});
 		xmpp.unsubscribe(rosterIQHandler);
 		xmpp.unsubscribe(presenceHandler);
 		events.subscribe("xmpp.connected", onConnected);
 	};
 
+	var mergeRoster = function (oldRoster, newRoster) {
+		oldRoster.version = newRoster.version;
+		Object.keys(oldRoster.contacts).forEach(function (jid) {
+			delete oldRoster.contacts[jid];
+		});
+		Object.keys(newRoster.contacts).forEach(function (jid) {
+			oldRoster.contacts[jid] = newRoster.contacts[jid];
+		});
+	};
+
 	var isIdenticalRosterItem = function (item1, item2) {
 		return (
 			["name", "ask", "subscription"].reduce(function (identical, property) {
@@ -202,18 +210,18 @@ function (events, xmpp, xpath, rosterCache, jidParser) {
 						) {
 							resource.priority = 0;
 						}
-						events.publish("contacts.available", presence, jid.bare, jid.resource, resource);
+						events.publish("roster.available", presence, jid.bare, jid.resource, resource);
 						break;
 					case "unavailable":
 						delete contact.resources[jid.resource];
 						var status = xpath(presence, "/client:presence/status", Object, xmlns);
-						events.publish("contacts.unavailable", presence, jid.bare, jid.resource, status ? status.textContent : "");
+						events.publish("roster.unavailable", presence, jid.bare, jid.resource, status ? status.textContent : "");
 						break;
 					case "subscribe":
 					case "subscribed":
 					case "unsubscribe":
 					case "unsubscribed":
-						events.publish("contacts." + type, presence, jid.bare, jid.resource);
+						events.publish("roster." + type, presence, jid.bare, jid.resource);
 						break;
 				}
 			}
@@ -227,7 +235,7 @@ function (events, xmpp, xpath, rosterCache, jidParser) {
 			var changedContacts = parseRosterIQ(iq, roster).changedContacts;
 			if (Object.keys(changedContacts).length > 0) {
 				rosterCache.save(xmpp.connection.jid.bare, roster);
-				events.publish("contacts.change", changedContacts);
+				events.publish("roster.change", changedContacts);
 			}
 			return true;
 		}

diff --git a/modules/rosterCache.js b/modules/rosterCache.js
@@ -1,9 +1,4 @@
-/**
-	This file is part of Web Client
-	@author Copyright (c) 2010 Sebastiaan Deckers
-	@license GNU General Public License version 3 or later
-*/
-define(function () {
+define(function () {
 	var rosterCache = null;
 	/*{
 		"user@server": {

diff --git a/modules/search.js b/modules/search.js
@@ -1,9 +1,4 @@
-/**
-	This file is part of Web Client
-	@author Copyright (c) 2010 Sebastiaan Deckers
-	@license GNU General Public License version 3 or later
-*/
-define(
+define(
 	[
 		"core/paths",
 		"core/events",

diff --git a/modules/twitterSearch.js b/modules/twitterSearch.js
@@ -1,9 +1,4 @@
-/**
-	This file is part of Web Client
-	@author Copyright (c) 2010 Sebastiaan Deckers
-	@license GNU General Public License version 3 or later
-*/
-define(["core/events"], function (events) {
+define(["core/events"], function (events) {
 	events.subscribe("search.query", function (queryString) {
 		/* TODO: Don't use require.js for this JSONP call since it doesn't clean up the script tag and caches results.
 		   See: http://requirejs.org/docs/api.html#jsonp

diff --git a/qunit.html b/qunit.html
@@ -1,9 +1,4 @@
 <!DOCTYPE html>
-<!--
-	This file is part of Web Client
-	@author Copyright (c) 2010 Sebastiaan Deckers
-	@license GNU General Public License version 3 or later
--->
 <html>
 	<head>
 		<meta charset="utf-8" />