Permalink
Browse files

Update orion.client

  • Loading branch information...
mamacdon committed Dec 7, 2012
1 parent 9b960c6 commit 2583a86b41dffdb2d42002b61bd8a24ec2eacdce
Showing with 1,142 additions and 224 deletions.
  1. +47 −4 lib/orion.client/bundles/org.eclipse.orion.client.core/web/css/ide.css
  2. +20 −0 lib/orion.client/bundles/org.eclipse.orion.client.core/web/css/images.css
  3. +2 −1 lib/orion.client/bundles/org.eclipse.orion.client.core/web/css/layout.css
  4. +7 −7 lib/orion.client/bundles/org.eclipse.orion.client.core/web/css/theme.css
  5. +2 −2 lib/orion.client/bundles/org.eclipse.orion.client.core/web/edit/edit.css
  6. +7 −2 lib/orion.client/bundles/org.eclipse.orion.client.core/web/edit/setup.js
  7. +13 −4 lib/orion.client/bundles/org.eclipse.orion.client.core/web/gcli/cli.js
  8. BIN lib/orion.client/bundles/org.eclipse.orion.client.core/web/images/gear-white.png
  9. BIN lib/orion.client/bundles/org.eclipse.orion.client.core/web/images/gear.png
  10. +48 −4 lib/orion.client/bundles/org.eclipse.orion.client.core/web/js-tests/URL/testcase.js
  11. +1 −1 lib/orion.client/bundles/org.eclipse.orion.client.core/web/js-tests/jsTestSuite.js
  12. +127 −0 lib/orion.client/bundles/org.eclipse.orion.client.core/web/orion/Deferred.js
  13. +285 −9 lib/orion.client/bundles/org.eclipse.orion.client.core/web/orion/URL-shim.js
  14. +4 −2 lib/orion.client/bundles/org.eclipse.orion.client.core/web/orion/commands.js
  15. +3 −0 lib/orion.client/bundles/org.eclipse.orion.client.core/web/orion/commonHTMLFragments.js
  16. +0 −46 lib/orion.client/bundles/org.eclipse.orion.client.core/web/orion/editorCommands.js
  17. +96 −0 lib/orion.client/bundles/org.eclipse.orion.client.core/web/orion/globalCommands.js
  18. +1 −1 lib/orion.client/bundles/org.eclipse.orion.client.core/web/orion/outliner.js
  19. +10 −2 lib/orion.client/bundles/org.eclipse.orion.client.core/web/orion/searchAndReplace/textSearcher.js
  20. +2 −0 lib/orion.client/bundles/org.eclipse.orion.client.core/web/orion/sites/siteClient.js
  21. +28 −6 lib/orion.client/bundles/org.eclipse.orion.client.core/web/orion/sites/sitesExplorer.js
  22. +14 −1 lib/orion.client/bundles/org.eclipse.orion.client.core/web/orion/webui/dropdown.js
  23. +14 −1 lib/orion.client/bundles/org.eclipse.orion.client.core/web/orion/webui/tooltip.js
  24. +4 −5 lib/orion.client/bundles/org.eclipse.orion.client.core/web/orion/widgets/UserMenu.js
  25. +3 −22 lib/orion.client/bundles/org.eclipse.orion.client.core/web/orion/widgets/themes/ThemeBuilder.js
  26. +319 −0 ....client/bundles/org.eclipse.orion.client.core/web/orion/widgets/themes/editor/MiniThemeChooser.js
  27. +4 −6 lib/orion.client/bundles/org.eclipse.orion.client.core/web/orion/widgets/themes/editor/ThemeData.js
  28. +18 −38 lib/orion.client/bundles/org.eclipse.orion.client.core/web/plugins/filePlugin/fileImpl.js
  29. +18 −38 lib/orion.client/bundles/org.eclipse.orion.client.core/web/plugins/filePlugin/webdavImpl.js
  30. +10 −3 lib/orion.client/bundles/org.eclipse.orion.client.core/web/shell/shellPage.js
  31. +4 −4 lib/orion.client/bundles/org.eclipse.orion.client.core/web/shell/shellPageFileService.js
  32. +0 −2 lib/orion.client/bundles/org.eclipse.orion.client.editor/web/examples/textview/textStylerOptions.js
  33. +1 −0 lib/orion.client/bundles/org.eclipse.orion.client.editor/web/orion/textview/rulers.css
  34. +30 −13 lib/orion.client/bundles/org.eclipse.orion.client.editor/web/orion/textview/textView.js
@@ -114,6 +114,7 @@ h2 {
color: #404040;
vertical-align: middle;
font-weight: normal;
+ color:silver;
}
.dismiss {
@@ -136,10 +137,12 @@ h2 {
margin-bottom: 8px;
font-weight: normal;
vertical-align: baseline;
+ color:silver;
}
.parameterInputurl {
width: 30em;
+ color:#333;
}
.parameterInputcheckbox {
@@ -149,6 +152,7 @@ h2 {
.parameterInputtextarea {
vertical-align: top;
width: 50em;
+ color:#333;
}
.parameterPopup {
@@ -394,14 +398,15 @@ h2 {
border-radius: 2px;
margin: 8px;
display: none;
- vertical-align:middle;
- font-size:11px;
+ vertical-align: middle;
+ font-size: 11px;
z-index: 50;
+ color: #999;
}
.slideParameters {
- border: 1px solid #808080;
- background-color: #d7d7d7;
+ border: 1px solid #555;
+ background-color: #555;
}
.slideContainerActive {
@@ -716,7 +721,17 @@ h2 {
}
input {
+ border-radius: 3px;
-moz-user-select: text;
+ text-indent: none;
+ text-indent: 0px;
+ text-shadow: none;
+ border: none;
+ border-radius: 2px;
+ color: #333;
+ font-size: 9pt;
+ padding: 2px;
+ margin-left: 5px;
}
.treeIterationCursor {
@@ -828,3 +843,31 @@ input {
.targetSelector{
}
+
+.setting-control {
+ display: inline-block;
+ width: 200px;
+ padding: 4px;
+ margin: 10px;
+ outline: none;
+ background-color: white;
+ border: 1px solid #CCC;
+ border-radius: 3px;
+ font-size: 12px;
+ color: #222;
+}
+
+.settingsPanelLabel {
+ margin-top: 10px;
+ min-width: 145px;
+ text-transform: uppercase;
+ color: #B3ADAA;
+ display: inline-block;
+}
+
+.settingsPanel{
+ position: relative;
+ float: right;
+ margin-right: 24px;
+ padding: 10px;
+}
@@ -77,3 +77,23 @@
.core-sprite-stop{ background-position: 0 -685px; width: 16px; height: 16px; }
.core-sprite-stylesheet{ background-position: 0 -703px; width: 16px; height: 16px; }
.core-sprite-warning{ background-position: 0 -721px; width: 16px; height: 16px; }
+
+
+.core-sprite-settings {
+ background: url(../images/gear.png) no-repeat top left;
+ vertical-align: middle;
+ display: inline-block;
+ margin-top: 4px;
+ height: 16px;
+ width: 16px;
+}
+
+.core-sprite-settings-white {
+ background: url(../images/gear-white.png) no-repeat top left;
+ vertical-align: middle;
+ display: inline-block;
+ margin-top: 4px;
+ height: 16px;
+ width: 16px;
+}
+
@@ -72,7 +72,8 @@ hard-coded numbers elsewhere.
.layoutBlock {
clear: both;
margin: 0;
- padding: 2px 8px;
+ /* padding: 2px 8px; */
+ padding: 4px 4px 2px 4px;
vertical-align: baseline;
}
@@ -303,7 +303,7 @@ a.currentLocation:hover {
.dropdownMenu {
color: #222;
background-color: #fbfbfb;
- display: none;
+ visibility: hidden;
z-index: 150;
min-width: 120px;
position: absolute;
@@ -334,18 +334,18 @@ a.currentLocation:hover {
padding: 4px 0;
}
-.dropdownMenu > li:hover {
- text-decoration: none;
- background: #ffeecc;
-}
-
.dropdownMenu > li > *:focus {
outline: 1px dotted #aaa;
+ background: #f3f6fe;
+}
+
+.dropdownMenu > li:hover {
+ text-decoration: none;
background: #ffeecc;
}
.dropdownMenuOpen {
- display: block;
+ visibility: visible;
}
.dropdownSeparator {
@@ -31,7 +31,7 @@
}
.findSlideoutButton {
- color: #222;
+ color: silver;
border: 1px solid transparent;
text-align: center;
vertical-align: top;
@@ -50,7 +50,7 @@
}
.findSlideoutMenu {
- color: #222;
+ color: silver;
background-color: transparent;
border: 1px solid transparent;
padding: 2px;
@@ -17,12 +17,12 @@ define(['i18n!orion/edit/nls/messages', 'require', 'dojo', 'orion/selection', 'o
'orion/problems', 'orion/editor/contentAssist', 'orion/editorCommands', 'orion/editor/editorFeatures', 'orion/editor/editor', 'orion/syntaxchecker',
'orion/textview/textView', 'orion/textview/textModel',
'orion/textview/projectionTextModel', 'orion/textview/keyBinding','orion/searchAndReplace/textSearcher',
- 'orion/edit/dispatcher', 'orion/contentTypes', 'orion/PageUtil', 'orion/highlight', "orion/i18nUtil", 'orion/edit/syntaxmodel',
+ 'orion/edit/dispatcher', 'orion/contentTypes', 'orion/PageUtil', 'orion/highlight', "orion/i18nUtil", 'orion/edit/syntaxmodel', 'orion/widgets/themes/editor/MiniThemeChooser',
'dojo/hash'],
function(messages, require, dojo, mSelection, mStatus, mProgress, mDialogs, mCommands, mFavorites,
mFileClient, mOperationsClient, mSearchClient, mGlobalCommands, mOutliner, mProblems, mContentAssist, mEditorCommands, mEditorFeatures, mEditor,
mSyntaxchecker, mTextView, mTextModel, mProjectionTextModel, mKeyBinding, mSearcher,
- mDispatcher, mContentTypes, PageUtil, Highlight, i18nUtil, SyntaxModelWirer) {
+ mDispatcher, mContentTypes, PageUtil, Highlight, i18nUtil, SyntaxModelWirer, mThemeChooser) {
var exports = exports || {};
@@ -139,6 +139,11 @@ exports.setUpEditor = function(serviceRegistry, preferences, isReadOnly){
this._contentType = contentTypeService.getFilenameContentType(this.getTitle());
name = this.getTitle();
}
+
+ var chooser = new mThemeChooser.MiniThemeChooser( preferences, editor.getTextView() );
+
+ mGlobalCommands.addSettings( chooser );
+
mGlobalCommands.setPageTarget({task: "Coding", name: name, target: metadata,
isFavoriteTarget: true, makeAlternate: function() {
if (metadata.Parents && metadata.Parents.length > 0) {
@@ -1107,11 +1107,10 @@ Requisition.prototype.exec = function(input) {
if (reply != null && typeof reply.then === 'function') {
reply.then(
function(data) { output.complete(data); },
- function(error) { output.error = true; output.complete(error); });
+ function(error) { output.error = true; output.complete(error); },
+ function(data) { output.progress(data); });
output.promise = reply;
- // Add progress to our promise and add a handler for it here
- // See bug 659300
}
else {
output.complete(reply);
@@ -1629,7 +1628,7 @@ function Output(options) {
}
/**
- * Called when there is data to display
+ * Called when there is data to display and the data completes execution of the command.
* @param data
*/
Output.prototype.complete = function(data) {
@@ -1642,6 +1641,16 @@ Output.prototype.complete = function(data) {
this.onChange({ output: this });
};
+/**
+ * Called when there is data to display.
+ * @param data The data up to this point.
+ */
+Output.prototype.progress = function(data) {
+ this.data = data;
+
+ this.onChange({ output: this });
+};
+
/**
* Convert to a DOM element for display.
* @param element The DOM node to which the data should be written. Existing
@@ -13,7 +13,7 @@
define(["orion/assert", "orion/URL-shim", "domReady!"], function(assert) {
var tests = {};
-
+
tests.testSpecificationURL = function() {
var spec = "http://dvcs.w3.org/hg/url/raw-file/tip/Overview.html";
var url = new URL(spec);
@@ -27,7 +27,7 @@ define(["orion/assert", "orion/URL-shim", "domReady!"], function(assert) {
assert.equal(url.search, "");
assert.equal(url.hash, "");
};
-
+
tests.testExampleURL = function() {
var spec = "http://www.example.com/a/b/c.html?p=q&r=s&p&p=t#hash";
var url = new URL(spec);
@@ -41,6 +41,50 @@ define(["orion/assert", "orion/URL-shim", "domReady!"], function(assert) {
assert.equal(url.search, "?p=q&r=s&p&p=t");
assert.equal(url.hash, "#hash");
};
-
+
+ tests.testUsernamePasswordURL = function() {
+ var spec = "http://www.example.com/a/b/c.html?p=q&r=s&p&p=t#hash";
+ var url = new URL(spec);
+ url.username = "a name";
+ assert.equal(url.href, "http://a%20name@www.example.com/a/b/c.html?p=q&r=s&p&p=t#hash");
+ url.password = "a password";
+ assert.equal(url.href, "http://a%20name:a%20password@www.example.com/a/b/c.html?p=q&r=s&p&p=t#hash");
+ url.username = "";
+ assert.equal(url.href, "http://:a%20password@www.example.com/a/b/c.html?p=q&r=s&p&p=t#hash");
+ url.username = "a name";
+ url.password = "";
+ assert.equal(url.href, "http://a%20name@www.example.com/a/b/c.html?p=q&r=s&p&p=t#hash");
+ url.username = "";
+ assert.equal(url.href, spec);
+ };
+
+ tests.testQuery = function() {
+ var spec = "http://dvcs.w3.org/hg/url/raw-file/tip/Overview.html";
+ var url = new URL(spec);
+ assert.equal(url.search,"");
+ assert.equal(url.query.size,0);
+ url.search = "?a=1&b=2";
+ assert.equal(url.query.size,2);
+ assert.equal(url.query.get("a"), "1");
+ assert.equal(url.query.get("b"), "2");
+ url.query.set("b","3");
+ assert.equal(url.query.get("b"), "3");
+ assert.equal(url.search, "?a=1&b=3");
+ assert.equal(url.query.has("c"), false);
+ assert.equal(url.query.has("a"), true);
+ assert.equal(url.query.has("b"), true);
+ url.query.append("b","4");
+ url.query.append("c","5");
+ url.query.append("a param","a value");
+ url.query.set("empty");
+ url.query.append("b","6");
+ assert.equal(url.search, "?a=1&b=3&b=4&c=5&a%20param=a%20value&empty&b=6");
+ url.query['delete']("b");
+ assert.equal(url.search, "?a=1&c=5&a%20param=a%20value&empty");
+ url.query.clear();
+ assert.equal(url.search, "");
+
+ };
+
return tests;
-});
+});
@@ -110,7 +110,6 @@ OrionTestCase("textview", "/js-tests/textview/test.html");
OrionTestCase("contentAssist", "/js-tests/editor/contentAssist/test.html");
OrionTestCase("jsTemplateContentAssist", "/js-tests/jsTemplateContentAssist/test.html");
OrionTestCase("contentTypes", "/js-tests/contentTypes/test.html");
-OrionTestCase("commands", "/js-tests/commands/test.html");
OrionTestCase("extensionParsing", "/js-tests/extensionParsing/test.html");
OrionTestCase("xhr", "/js-tests/xhr/test.html");
OrionTestCase("config", "/js-tests/config/test.html");
@@ -119,6 +118,7 @@ OrionTestCase("setting", "/js-tests/settings/test.html");
OrionTestCase("esprima-content-assist", "/js-tests/esprima/esprimaJsContentAssistTests.html");
OrionTestCase("asyncStyler", "/js-tests/asyncStyler/test.html");
OrionTestCase("syntaxmodel", "/js-tests/syntaxmodel/test.html");
+OrionTestCase("commands", "/js-tests/commands/test.html");
//OrionTestCase("searchRendering", "/js-tests/searchRendering/test.html");
//OrionUITestCase("textviewPerformance", "/js-tests/textview/test-performance.html");
Oops, something went wrong.

0 comments on commit 2583a86

Please sign in to comment.