Merge pull request #5389 from 6ix4our/master

Combined .d.ts files for simplicity.

xrm/clientglobalcontext.d.ts

@@ -1,14 +0,0 @@
-// Type definitions for Microsoft Dynamics xRM ClientGlobalContext.js.aspx
-// Project: http://msdn.microsoft.com/en-us/library/gg328255.aspx
-// Definitions by: David Berry <https://github.com/6ix4our/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-
-/// <reference path="xrm.d.ts" />
-
-/**
- * Gets the xRM application context, for HTML web resources
- * @returns {Xrm.Context}   The application context for the user's current session.
- * @remarks The ClientGlobalContext.js.aspx page will include some global event handlers. These event handlers will 
- *          cancel the onselectstart, contextmenu, and ondragstart events.
- */
-declare function GetGlobalContext(): Xrm.Context;

xrm/xrm-6.d.ts

@@ -2069,3 +2069,11 @@ declare module Xrm
         export function openWebResource( webResourceName: string, webResourceData?: string, width?: number, height?: number ): Window;
     }
 }
+
+/**
+ * Gets the xRM application context, for HTML web resources, included by ClientGlobalContext.js.aspx
+ * @returns {Xrm.Context}   The application context for the user's current session.
+ * @remarks The ClientGlobalContext.js.aspx page will include some global event handlers. These event handlers will 
+ *          cancel the onselectstart, contextmenu, and ondragstart events.
+ */
+declare function GetGlobalContext(): Xrm.Context;

xrm/xrm-6.tests.ts

@@ -1,5 +1,4 @@
 /// <reference path="xrm-6.d.ts" />
-/// <reference path="clientglobalcontext.d.ts" />
 
 function _getContext()
 {

xrm/xrm-7.0.d.ts

@@ -2348,3 +2348,11 @@ declare module Xrm
         export function openWebResource( webResourceName: string, webResourceData?: string, width?: number, height?: number ): Window;
     }
 }
+
+/**
+ * Gets the xRM application context, for HTML web resources, included by ClientGlobalContext.js.aspx
+ * @returns {Xrm.Context}   The application context for the user's current session.
+ * @remarks The ClientGlobalContext.js.aspx page will include some global event handlers. These event handlers will 
+ *          cancel the onselectstart, contextmenu, and ondragstart events.
+ */
+declare function GetGlobalContext(): Xrm.Context;

xrm/xrm-7.0.tests.ts

@@ -1,5 +1,4 @@
 /// <reference path="xrm-7.0.d.ts" />
-/// <reference path="clientglobalcontext.d.ts" />
 
 function _getContext()
 {

xrm/xrm-tests.ts

@@ -1,5 +1,4 @@
 /// <reference path="xrm.d.ts" />
-/// <reference path="clientglobalcontext.d.ts" />
 /// <reference path="parature.d.ts" />
 
 /// Demonstrate clientglobalcontext.d.ts 

xrm/xrm.d.ts

@@ -2584,3 +2584,11 @@ declare module Xrm
         export function openWebResource( webResourceName: string, webResourceData?: string, width?: number, height?: number ): Window;
     }
 }
+
+/**
+ * Gets the xRM application context, for HTML web resources, included by ClientGlobalContext.js.aspx
+ * @returns {Xrm.Context}   The application context for the user's current session.
+ * @remarks The ClientGlobalContext.js.aspx page will include some global event handlers. These event handlers will 
+ *          cancel the onselectstart, contextmenu, and ondragstart events.
+ */
+declare function GetGlobalContext(): Xrm.Context;