Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Status line #1

Merged
merged 2 commits into from
Aug 19, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion bundles/org.eclipse.orion.client.ui/web/orion/editorView.js
Original file line number Diff line number Diff line change
Expand Up @@ -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$
Expand All @@ -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) {
Expand Down
6 changes: 5 additions & 1 deletion bundles/org.eclipse.orion.client.ui/web/orion/status.js
Original file line number Diff line number Diff line change
Expand Up @@ -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$
Expand Down
8 changes: 4 additions & 4 deletions modules/orionode/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down Expand Up @@ -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",
Expand Down