update.php: remove event type 'error' as it's unused

eventsource.js: fixing typos and JSDoc comment

2 files changed, 4 insertions, 10 deletions

diff --git a/core/ajax/update.php b/core/ajax/update.php
index 6aa062ef9da..2b9275dabd5 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -14,7 +14,6 @@ if (OC::checkUpgrade(false)) {
 	OC_Log::write('core', 'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, OC_Log::WARN);
 	$watcher = new UpdateWatcher($updateEventSource);
 	OC_Hook::connect('update', 'success', $watcher, 'success');
-	OC_Hook::connect('update', 'error', $watcher, 'error');
 	OC_Hook::connect('update', 'failure', $watcher, 'failure');
 	$watcher->success('Turned on maintenance mode');
 	try {
@@ -95,12 +94,6 @@ class UpdateWatcher {
 		ob_start();
 	}
 
-	public function error($message) {
-		OC_Util::obEnd();
-		$this->eventSource->send('error', $message);
-		ob_start();
-	}
-
 	public function failure($message) {
 		OC_Util::obEnd();
 		$this->eventSource->send('failure', $message);
diff --git a/core/js/eventsource.js b/core/js/eventsource.js
index 536b180bc8f..aeebb4203bf 100644
--- a/core/js/eventsource.js
+++ b/core/js/eventsource.js
@@ -23,13 +23,14 @@
  * wrapper for server side events (http://en.wikipedia.org/wiki/Server-sent_events)
  * includes a fallback for older browsers and IE
  *
- * use server side events with causion, to many open requests can hang the server
+ * use server side events with caution, to many open requests can hang the server
  */
 
 /**
  * create a new event source
- * @param string src
- * @param object data to be send as GET
+ * @param src
+ * @param data to be send as GET
+ * @constructor
  */
 OC.EventSource=function(src,data){
 	var dataStr='';