Merge pull request #1 from kdvolder/status-line

Status line
BoykoAlex · Aug 19, 2014 · 3d20351 · 3d20351
2 parents fc0d014 + 9ce1731
commit 3d20351
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/editorView.js b/bundles/org.eclipse.orion.client.ui/web/orion/editorView.js
@@ -487,7 +487,8 @@ define([
 
 			var contextImpl = {};
 			var liveContextImpl = {};
-			[	
+			var msgService = serviceRegistry.getService("orion.page.message");
+			[
 				"getCaretOffset", "setCaretOffset", //$NON-NLS-1$ //$NON-NLS-0$
 				"getSelection", "setSelection", //$NON-NLS-1$ //$NON-NLS-0$
 				"getText", "setText", //$NON-NLS-1$ //$NON-NLS-0$
@@ -502,6 +503,15 @@ define([
 			liveContextImpl.showMarkers = function(markers) {
 				serviceRegistry.getService("orion.core.marker")._setProblems(markers);
 			};
+			liveContextImpl.showProgressMessage = function (msg) {
+				msgService.setProgressMessage(msg);
+			};
+			liveContextImpl.showProgressResult = function (msg) {
+				msgService.setProgressResult(msg);
+			};
+			liveContextImpl.showProgressError = function (msg) {
+				msgService.setProgressResult({Severity: 'Error', Message: msg});
+			};
 			serviceRegistry.registerService("orion.edit.context", contextImpl, null); //$NON-NLS-0$
 			serviceRegistry.registerService("orion.edit.liveContext", liveContextImpl, null); //$NON-NLS-0$
 			if(this.editorPreferences) {

diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/status.js b/bundles/org.eclipse.orion.client.ui/web/orion/status.js
@@ -253,7 +253,11 @@ define([
 					removedClasses.push("progressWarning");
 					removedClasses.push("progressInfo");
 					removedClasses.push("progressNormal"); //$NON-NLS-0$
-					this._clickToDisMiss = true;
+					this._clickToDisMiss = false; 
+					//                     ^^^^^ Changed:
+					// Error's should be somewhat harder to dismiss than info messages 
+					// 'disapear on click' makes them sometimes disappear 'by accident'
+					// before one has a chance to really read them.
 					break;
 				default:
 					extraClass="progressNormal"; //$NON-NLS-0$

diff --git a/modules/orionode/package.json b/modules/orionode/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "orion",
-  "version": "0.0.32",
-  "description": "An Eclipse Orion server based on Node.js and connect.",
+  "name": "orion-flux",
+  "version": "0.0.33",
+  "description": "An Eclipse Orion server based on Node.js and connect. Modified somewhat to accomodate flux",
   "homepage": "http://eclipse.org/orion/",
   "bugs": "https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Orion&component=Node",
   "dependencies": {
@@ -33,7 +33,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://git.eclipse.org/gitroot/orion/org.eclipse.orion.client.git"
+    "url": "git@github.com:BoykoAlex/orion.client.git"
   },
   "keywords": [
     "orion",