Merge branch 'master' of http://git.eclipse.org/gitroot/orion/org.ecl…

…ipse.orion.client
BoykoAlex · Jul 19, 2014 · fc0d014 · fc0d014
2 parents fb52522 + 499d4a7
commit fc0d014
Show file tree

Hide file tree

Showing 782 changed files with 7,520 additions and 4,523 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,7 @@
 /.project
-bin
-
-# Maven artifacts
-target/
+/*/*/bin/
+/target/
+/*/*/target/
 
 # JSDoc
 /doc/org.eclipse.orion.doc.isv/jsdoc/files.html

diff --git a/File b/File
diff --git a/bundles/org.eclipse.orion.client.cf/web/cfui/deploy.html b/bundles/org.eclipse.orion.client.cf/web/cfui/deploy.html
@@ -3,7 +3,7 @@
     <link rel="stylesheet" type="text/css" href="css/deploy.css" />
 	<script src="../requirejs/require.js"></script>
 	<script type="text/javascript">
-	/*global require*/
+	/*eslint-env browser, amd*/
 		require({
 		  baseUrl: '..',
 		  packages: [],

diff --git a/bundles/org.eclipse.orion.client.cf/web/cfui/deploy.js b/bundles/org.eclipse.orion.client.cf/web/cfui/deploy.js
@@ -1,4 +1,4 @@
-/*global parent window document define orion setTimeout*/
+/*eslint-env browser,amd*/
 
 var uiTestFunc = null;
 

diff --git a/bundles/org.eclipse.orion.client.cf/web/cfui/logs.html b/bundles/org.eclipse.orion.client.cf/web/cfui/logs.html
@@ -9,7 +9,7 @@
 		<link rel="icon" href="/images/repository.png" type="image/png">
 		<script src="../requirejs/require.js"></script>
 		<script type="text/javascript">
-		/*global require*/
+		/*eslint-env browser, amd*/
 			require({
 			  baseUrl: '..',
 			  packages: [],

diff --git a/bundles/org.eclipse.orion.client.cf/web/cfui/logs.js b/bundles/org.eclipse.orion.client.cf/web/cfui/logs.js
@@ -7,7 +7,7 @@
  * duplication or disclosure restricted by GSA ADP Schedule 
  * Contract with IBM Corp.
  *******************************************************************************/
- /*global define window document*/
+/*eslint-env browser, amd*/
 
 define(['orion/webui/littlelib', 'orion/bootstrap', 'orion/status', 'orion/progress', 'orion/commandRegistry',  'orion/keyBinding', 'orion/dialogs', 'orion/selection',
 	'orion/contentTypes','orion/fileClient', 'orion/operationsClient', 'orion/searchClient', 'orion/globalCommands', 'orion/links',

diff --git a/bundles/org.eclipse.orion.client.cf/web/cfui/nls/messages.js b/bundles/org.eclipse.orion.client.cf/web/cfui/nls/messages.js
@@ -9,7 +9,7 @@
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
 
- /*global define*/
+/*eslint-env browser,amd*/
 
 define(['orion/i18n!cfui/nls/messages', 'cfui/nls/root/messages'], function(bundle, root) {
 	var result = {

diff --git a/bundles/org.eclipse.orion.client.cf/web/cfui/nls/root/messages.js b/bundles/org.eclipse.orion.client.cf/web/cfui/nls/root/messages.js
@@ -8,7 +8,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
- /*global define*/
+/*eslint-env browser,amd*/
 
 //NLS_CHARSET=UTF-8
 

diff --git a/bundles/org.eclipse.orion.client.cf/web/cfui/plugins/cFDeployPlugin.html b/bundles/org.eclipse.orion.client.cf/web/cfui/plugins/cFDeployPlugin.html
@@ -5,7 +5,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<script src="../../requirejs/require.js"></script>
 	<script type="text/javascript">
-		/*global require define*/
+		/*eslint-env browser, amd*/
 		require({
 		  baseUrl: '../../',
 		  // set the paths to our library packages

diff --git a/bundles/org.eclipse.orion.client.cf/web/cfui/plugins/cFDeployService.js b/bundles/org.eclipse.orion.client.cf/web/cfui/plugins/cFDeployService.js
@@ -9,7 +9,7 @@
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
 
-/*global window define document*/
+/*eslint-env browser,amd*/
 
 define(['orion/Deferred', 'orion/cfui/cFClient', 'orion/URITemplate', 'orion/serviceregistry', 
         'orion/preferences', 'orion/PageLinks', 'orion/xhr'],

diff --git a/bundles/org.eclipse.orion.client.cf/web/cfui/plugins/cFPlugin.html b/bundles/org.eclipse.orion.client.cf/web/cfui/plugins/cFPlugin.html
@@ -5,7 +5,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<script src="../../requirejs/require.js"></script>
 	<script type="text/javascript">
-		/*global require*/
+		/*eslint-env browser, amd*/
 		require({
 		  baseUrl: '../../',
 		  // set the paths to our library packages

diff --git a/bundles/org.eclipse.orion.client.cf/web/cfui/plugins/cFPlugin.js b/bundles/org.eclipse.orion.client.cf/web/cfui/plugins/cFPlugin.js
@@ -9,12 +9,10 @@
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
 
-/*global window document define setTimeout*/
+/*eslint-env browser,amd*/
 
-define(['i18n!cfui/nls/messages','require', 'orion/xhr', 'orion/Deferred', 'orion/plugin', 'orion/cfui/cFClient', 'orion/serviceregistry', 
-        'orion/preferences', 'orion/URITemplate', 'orion/PageLinks', 'domReady!'],
-		function(messages,require, xhr, Deferred, PluginProvider, CFClient, ServiceRegistry, Preferences, URITemplate,
-			PageLinks) {
+define(['i18n!cfui/nls/messages', 'orion/xhr', 'orion/plugin', 'orion/cfui/cFClient', 'orion/serviceregistry', 'domReady!'],
+		function(messages, xhr, PluginProvider, CFClient, ServiceRegistry) {
 
 	var temp = document.createElement('a');
 	var login = temp.href;

diff --git a/bundles/org.eclipse.orion.client.cf/web/orion/cfui/cFClient.js b/bundles/org.eclipse.orion.client.cf/web/orion/cfui/cFClient.js
@@ -9,7 +9,7 @@
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
 
-/*global define*/
+/*eslint-env browser, amd*/
 define(['require', 'orion/xhr', 'orion/Deferred', 'orion/operation'], function(require, xhr, Deferred, operation) {
 
 	var eclipse = eclipse || {};
@@ -68,7 +68,7 @@ define(['require', 'orion/xhr', 'orion/Deferred', 'orion/operation'], function(r
 					json = JSON.parse(response.responseText);
 				} catch (e) {
 					json = { 
-						Message : messages["Problem while performing the action"]
+						Message : "Problem while performing the action"
 					};
 				}
 				json.HttpCode = response.status;

diff --git a/bundles/org.eclipse.orion.client.cf/web/orion/cfui/logView.js b/bundles/org.eclipse.orion.client.cf/web/orion/cfui/logView.js
@@ -8,19 +8,16 @@
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
 
-/*global define document window URL console*/
+/*eslint-env browser, amd*/
 define([
-	'orion/editor/editor',
 	'orion/editor/textModel',
 	'orion/editorView',
 	'orion/inputManager',
 	'orion/objects',
-	'orion/webui/littlelib',
-	'orion/PageUtil',
 	'orion/Deferred',
 	'orion/globalCommands',
 	'orion/URL-shim'
-], function(mEditor, mTextModel, mEditorView, mInputManager, objects, lib, PageUtil, Deferred, mGlobalCommands) {
+], function(mTextModel, mEditorView, mInputManager, objects, Deferred, mGlobalCommands) {
 
 	function handleError(statusService, error) {
 		if (!statusService) {

diff --git a/bundles/org.eclipse.orion.client.cf/web/orion/cfui/logsExplorer.js b/bundles/org.eclipse.orion.client.cf/web/orion/cfui/logsExplorer.js
@@ -9,7 +9,7 @@
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
 
-/*global define window document */
+/*eslint-env browser, amd*/
 define([
 	'orion/webui/littlelib',
 	'orion/explorers/explorer',

diff --git a/bundles/org.eclipse.orion.client.cf/web/orion/cfui/widgets/CfLoginDialog.js b/bundles/org.eclipse.orion.client.cf/web/orion/cfui/widgets/CfLoginDialog.js
@@ -7,8 +7,7 @@
  * duplication or disclosure restricted by GSA ADP Schedule 
  * Contract with IBM Corp.
  *******************************************************************************/
-/*global define*/
-/*jslint browser:true*/
+/*eslint-env browser, amd*/
 define(['orion/webui/dialog'], function(dialog) {
 
 /**

diff --git a/bundles/org.eclipse.orion.client.core/web/js-tests/core/URITemplate/URITemplateTests.js b/bundles/org.eclipse.orion.client.core/web/js-tests/core/URITemplate/URITemplateTests.js
@@ -8,7 +8,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-/*jslint amd:true mocha:true*/
+/*eslint-env browser, amd, mocha*/
 define([
 	"chai/chai",
 	"orion/URITemplate",

diff --git a/bundles/org.eclipse.orion.client.core/web/js-tests/core/URL/URLTests.js b/bundles/org.eclipse.orion.client.core/web/js-tests/core/URL/URLTests.js
@@ -8,7 +8,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-/*jslint amd:true mocha:true*/
+/*eslint-env browser, amd, mocha*/
 /*global URL*/
 define([
 	"chai/chai",

diff --git a/bundles/org.eclipse.orion.client.core/web/js-tests/core/base64/base64Tests.js b/bundles/org.eclipse.orion.client.core/web/js-tests/core/base64/base64Tests.js
@@ -8,8 +8,8 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-/*global console Uint8Array*/
-/*jslint amd:true mocha:true*/
+/*eslint-env browser, amd, mocha*/
+
 define(["chai/chai", "orion/Base64", "mocha/mocha"], function(chai, Base64) {
 	var assert = chai.assert;
 	var testData = "abcdef";

diff --git a/bundles/org.eclipse.orion.client.core/web/js-tests/core/config/configTests.js b/bundles/org.eclipse.orion.client.core/web/js-tests/core/config/configTests.js
@@ -8,7 +8,7 @@
  *
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-/*jslint amd:true browser:true mocha:true */
+/*eslint-env browser, amd, mocha*/
 define([
 	'chai/chai',
 	'js-tests/core/config/mockPrefs',

diff --git a/bundles/org.eclipse.orion.client.core/web/js-tests/core/config/mockPrefs.js b/bundles/org.eclipse.orion.client.core/web/js-tests/core/config/mockPrefs.js
@@ -8,7 +8,7 @@
  *
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-/*jslint amd:true browser:true*/
+/*eslint-env browser, amd, mocha*/
 define([
 	"orion/Deferred",
 	"orion/preferences", // Only used for constant field values, no API calls

diff --git a/bundles/org.eclipse.orion.client.core/web/js-tests/core/config/testManagedServicePlugin.html b/bundles/org.eclipse.orion.client.core/web/js-tests/core/config/testManagedServicePlugin.html
@@ -3,7 +3,8 @@
 <head>
 	<script src="../../../orion/plugin.js"></script>
 	<script>
-		/*global console eclipse window*/
+		/*eslint-env browser, amd*/
+		/*global orion*/
 		window.onload = function() {
 			var provider = new orion.PluginProvider();
 			var callOrder = [];

diff --git a/bundles/org.eclipse.orion.client.core/web/js-tests/core/coreTests.html b/bundles/org.eclipse.orion.client.core/web/js-tests/core/coreTests.html
@@ -5,7 +5,7 @@
 	<link rel="stylesheet" href="../../mocha/mocha.css" />
 	<script src="../../requirejs/require.js"></script>
 	<script>
-		/*jslint amd:true*/
+		/*eslint-env browser,amd*/
 		require({
 		baseUrl: "../../",
 		paths: {

diff --git a/bundles/org.eclipse.orion.client.core/web/js-tests/core/deferred/deferredTests.js b/bundles/org.eclipse.orion.client.core/web/js-tests/core/deferred/deferredTests.js
@@ -8,8 +8,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-/*global Mocha*/
-/*jslint amd:true browser:true mocha:true */
+/*eslint-env browser, amd, mocha*/
 
 define(["chai/chai", "orion/Deferred", "mocha/mocha"], function(chai, Deferred) {
 	var assert = chai.assert;

diff --git a/bundles/org.eclipse.orion.client.core/web/js-tests/core/metatype/metatypeTests.js b/bundles/org.eclipse.orion.client.core/web/js-tests/core/metatype/metatypeTests.js
@@ -8,7 +8,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-/*jslint amd:true mocha:true*/
+/*eslint-env browser, amd, mocha*/
 define([
 	'chai/chai',
 	'orion/serviceregistry',

diff --git a/...les/org.eclipse.orion.client.core/web/js-tests/core/pluginregistry/pluginregistryTests.js b/...les/org.eclipse.orion.client.core/web/js-tests/core/pluginregistry/pluginregistryTests.js
@@ -8,7 +8,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-/*jslint amd:true browser:true mocha:true */
+/*eslint-env browser, amd, mocha*/
 define([
 	"chai/chai",
 	"orion/serviceregistry",

diff --git a/bundles/org.eclipse.orion.client.core/web/js-tests/core/pluginregistry/testPlugin.html b/bundles/org.eclipse.orion.client.core/web/js-tests/core/pluginregistry/testPlugin.html
@@ -4,7 +4,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<script src="../../../requirejs/require.js"></script>
 	<script>
-		/*global require orion window console*/
+		/*eslint-env browser, amd, mocha*/
 		require({
 		  baseUrl: '../../../',
 		  paths: {

diff --git a/bundles/org.eclipse.orion.client.core/web/js-tests/core/pluginregistry/testPlugin2.html b/bundles/org.eclipse.orion.client.core/web/js-tests/core/pluginregistry/testPlugin2.html
@@ -4,7 +4,8 @@
 	<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
 	<script src='../../../orion/plugin.js'></script>
 	<script>
-		/*global orion window eclipse console*/
+		/*eslint-env browser*/
+		/*global orion*/
 		window.onload = function() {
 			var provider = new orion.PluginProvider();
 			var callOrder = [];

diff --git a/bundles/org.eclipse.orion.client.core/web/js-tests/core/pluginregistry/testPlugin3.html b/bundles/org.eclipse.orion.client.core/web/js-tests/core/pluginregistry/testPlugin3.html
@@ -4,8 +4,9 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<script src="../../../requirejs/require.js"></script>
 	<script>
+	/*eslint-env browser, amd*/
 	parent.postMessage("!_{h:'http%3A//127.0.0.2%3A8080/orionGoogleDriveFileSystem.html_1372335923473'}", "*"); //$NON-NLS-0$
-		/*global require orion window console*/
+
 		require({
 		  baseUrl: '../../../',
 		  paths: {

diff --git a/bundles/org.eclipse.orion.client.core/web/js-tests/core/pluginregistry/testsandbox.html b/bundles/org.eclipse.orion.client.core/web/js-tests/core/pluginregistry/testsandbox.html
@@ -3,7 +3,7 @@
 <head>
 	<meta http-equiv='Content-Type' content='text/html; charset=UTF-8'>
 	<script>
-	/*global top self location*/
+	/*eslint-env browser*/
 		if(top !== self) {
 			top.location.replace(location);
 		}

diff --git a/bundles/org.eclipse.orion.client.core/web/js-tests/core/preferences/preferencesTests.js b/bundles/org.eclipse.orion.client.core/web/js-tests/core/preferences/preferencesTests.js
@@ -8,8 +8,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-/*jslint amd:true browser:true mocha:true*/
-/*global console*/
+/*eslint-env browser, amd, mocha*/
 define([
 	"chai/chai",
 	"orion/Deferred",

diff --git a/...les/org.eclipse.orion.client.core/web/js-tests/core/serviceTracker/serviceTrackerTests.js b/...les/org.eclipse.orion.client.core/web/js-tests/core/serviceTracker/serviceTrackerTests.js
@@ -8,7 +8,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-/*jslint amd:true mocha:true*/
+/*eslint-env browser, amd, mocha*/
 define([
 	"chai/chai",
 	"orion/serviceregistry",

diff --git a/...s/org.eclipse.orion.client.core/web/js-tests/core/serviceregistry/serviceregistryTests.js b/...s/org.eclipse.orion.client.core/web/js-tests/core/serviceregistry/serviceregistryTests.js
@@ -8,8 +8,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-/*jslint amd:true mocha:true*/
-
+/*eslint-env browser, amd, mocha*/
 define([
 	"chai/chai",
 	"orion/serviceregistry",

diff --git a/bundles/org.eclipse.orion.client.core/web/js-tests/core/xhr/xhrTests.js b/bundles/org.eclipse.orion.client.core/web/js-tests/core/xhr/xhrTests.js
@@ -8,7 +8,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-/*jslint amd:true browser:true mocha:true*/
+/*eslint-env browser, amd, mocha*/
 define([
 	"chai/chai",
 	"orion/Deferred",

diff --git a/bundles/org.eclipse.orion.client.core/web/mocha/sauce.js b/bundles/org.eclipse.orion.client.core/web/mocha/sauce.js
@@ -8,8 +8,10 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-/*jslint amd:true browser:true */
+/*eslint-env browser,amd*/
+/*eslint no-new-func:0*/
 /*global console:true TextEncoder*/
+
 /**
  * Wrapper for mocha that exposes mocha test results to Sauce Labs.
  * 
@@ -30,8 +32,8 @@ define([
 	"mocha/mocha", // no exports
 	"orion/encoding-shim", // no exports
 ], function(Base64, pako, objects) {
+	// this is done to allow us to get the global even in strict mode
 	var global = new Function("return this")();
-
 	// Try to filter non-xunit log messages, so tests that print junk to the console are less likely to break xunit report.
 	function isXunit(message) {
 		return /^<\/?test(case|suite)/.test(message);

diff --git a/bundles/org.eclipse.orion.client.core/web/orion/Base64.js b/bundles/org.eclipse.orion.client.core/web/orion/Base64.js
@@ -8,8 +8,7 @@
  *
  * Contributors: IBM Corporation - initial API and implementation
  *******************************************************************************/
-
-/*global define atob btoa*/
+/*eslint-env browser, amd*/
 define(function() {
 
 	var handlesWhitespace = (function(){

diff --git a/bundles/org.eclipse.orion.client.core/web/orion/Deferred.js b/bundles/org.eclipse.orion.client.core/web/orion/Deferred.js
@@ -8,8 +8,7 @@
  * 
  * Contributors: IBM Corporation - initial API and implementation
  ******************************************************************************/
-/*global exports module define setTimeout process document MutationObserver*/
-
+/*eslint-env browser, amd, node*/
 (function(root, factory) { // UMD
     if (typeof define === "function" && define.amd) { //$NON-NLS-0$
         define(factory);

diff --git a/bundles/org.eclipse.orion.client.core/web/orion/EventTarget.js b/bundles/org.eclipse.orion.client.core/web/orion/EventTarget.js
@@ -9,8 +9,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-/*global define console*/
-
+/*eslint-env browser, amd*/
 define(function() {
 	/**
 	 * Creates an Event Target

diff --git a/bundles/org.eclipse.orion.client.core/web/orion/HTMLTemplates-shim.js b/bundles/org.eclipse.orion.client.core/web/orion/HTMLTemplates-shim.js
@@ -9,7 +9,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-/*global window document addEventListener removeEventListener*/
+/*eslint-env browser, amd*/
 // HTML Templates Shim -- see http://dvcs.w3.org/hg/webcomponents/raw-file/tip/spec/templates/index.html
 
 (function() {