From 1e6f9984b7a9e47eb73c64fbc029b92e3d6a0aea Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Fri, 15 Aug 2014 11:06:02 -0700 Subject: [PATCH 1/2] Update package.json to publish to node-central under a new name --- modules/orionode/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/orionode/package.json b/modules/orionode/package.json index 8ac94e1223..bc2fd9a5b8 100644 --- a/modules/orionode/package.json +++ b/modules/orionode/package.json @@ -1,7 +1,7 @@ { - "name": "orion", + "name": "orion-flux", "version": "0.0.32", - "description": "An Eclipse Orion server based on Node.js and connect.", + "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", From 9ce1731ca0c127f0d8e0af8afd136225d3c0ab73 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Tue, 19 Aug 2014 09:51:06 -0700 Subject: [PATCH 2/2] Add 'progress status' message support to live edit sessions --- .../web/orion/editorView.js | 12 +++++++++++- .../org.eclipse.orion.client.ui/web/orion/status.js | 6 +++++- modules/orionode/package.json | 2 +- 3 files changed, 17 insertions(+), 3 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 index 8e5c24dfbb..aae103839d 100644 --- 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 index ff91c19f98..14245045fa 100644 --- 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 index bc2fd9a5b8..2198d897c8 100644 --- a/modules/orionode/package.json +++ b/modules/orionode/package.json @@ -1,6 +1,6 @@ { "name": "orion-flux", - "version": "0.0.32", + "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",