From 4b44767f4a05c7628c1306ca6e492e20abd646d5 Mon Sep 17 00:00:00 2001 From: Neil Stalker Date: Fri, 21 Jun 2013 15:21:45 +0100 Subject: [PATCH 1/5] Fix colors for 0.9 and rename test file --- colors/{colors.test.ts => colors-test.ts} | 0 colors/colors.d.ts | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename colors/{colors.test.ts => colors-test.ts} (100%) diff --git a/colors/colors.test.ts b/colors/colors-test.ts similarity index 100% rename from colors/colors.test.ts rename to colors/colors-test.ts diff --git a/colors/colors.d.ts b/colors/colors.d.ts index 99388e69db..c87112d7c4 100644 --- a/colors/colors.d.ts +++ b/colors/colors.d.ts @@ -3,7 +3,7 @@ // Definitions by: Bart van der Schoor // Definitions: https://github.com/borisyankov/DefinitelyTyped -declare interface String { +interface String { bold:string; italic:string; underline:string; From 7b441a8d21a1bf0fe44c64b1a068a9ff987d893f Mon Sep 17 00:00:00 2001 From: Neil Stalker Date: Fri, 21 Jun 2013 15:47:23 +0100 Subject: [PATCH 2/5] fix i18next, jsFixtures, sinon and expect for TS 0.9 move and rename i18next test file --- expect.js/expect.js.d.ts | 2 +- .../i18next.d.tests.ts => i18next-tests.ts} | 40 +- i18next/i18next.d.ts | 2 +- i18next/lib/jquery.d.ts | 758 ------------------ i18next/lib/mocha.d.ts | 44 - i18next/lib/sinon.d.ts | 33 - js-fixtures/fixtures.d.ts | 2 +- sinon/sinon-1.5.d.ts | 2 +- 8 files changed, 17 insertions(+), 866 deletions(-) rename i18next/{tests/i18next.d.tests.ts => i18next-tests.ts} (96%) delete mode 100644 i18next/lib/jquery.d.ts delete mode 100644 i18next/lib/mocha.d.ts delete mode 100644 i18next/lib/sinon.d.ts diff --git a/expect.js/expect.js.d.ts b/expect.js/expect.js.d.ts index c4884f07d9..c943f4e4f2 100644 --- a/expect.js/expect.js.d.ts +++ b/expect.js/expect.js.d.ts @@ -5,7 +5,7 @@ declare function expect(target?: any): Expect.Root; -module Expect { +declare module Expect { interface Assertion { /** * Check if the value is truthy diff --git a/i18next/tests/i18next.d.tests.ts b/i18next/i18next-tests.ts similarity index 96% rename from i18next/tests/i18next.d.tests.ts rename to i18next/i18next-tests.ts index 2feb294b1f..a0fbd4332c 100644 --- a/i18next/tests/i18next.d.tests.ts +++ b/i18next/i18next-tests.ts @@ -1,15 +1,12 @@ -/// -/// +/// +/// +/// +/// /// -/// - -// declarations for expect.js -declare var expect: (actual: string) => any; -declare var expect: (actual: number) => any; - -// declarations for jsfixtures.js -declare var setFixtures: (html) => void; +/// +declare function done(): void; + describe('i18next', function () { var i18n = $.i18n @@ -1221,9 +1218,7 @@ describe('i18next', function () { }; beforeEach(function (done) { - setFixtures(' - -'); + fixtures.set(''); i18n.init($.extend(opts, { resStore: resStore }), function (t) { done(); }); @@ -1250,9 +1245,7 @@ describe('i18next', function () { }; beforeEach(function (done) { - setFixtures(' - -'); + fixtures.set(''); i18n.init($.extend(opts, { resStore: resStore }), function (t) { done(); }); @@ -1279,9 +1272,7 @@ describe('i18next', function () { }; beforeEach(function (done) { - setFixtures(' - -'); + fixtures.set(''); i18n.init($.extend(opts, { resStore: resStore }), function (t) { done(); }); @@ -1299,14 +1290,11 @@ describe('i18next', function () { var resStore = { dev: { translation: {} }, en: { translation: {} }, - 'en-US': { translation: { 'simpleTest': ' -test -' } } + 'en-US': { translation: { 'simpleTest': 'test' } } }; beforeEach(function (done) { - setFixtures(' -'); + fixtures.set(''); i18n.init($.extend(opts, { resStore: resStore }), function (t) { done(); }); @@ -1329,9 +1317,7 @@ test }; beforeEach(function (done) { - setFixtures(' - -'); + fixtures.set(''); i18n.init($.extend(opts, { resStore: resStore, diff --git a/i18next/i18next.d.ts b/i18next/i18next.d.ts index cd85d71049..a1b8436404 100644 --- a/i18next/i18next.d.ts +++ b/i18next/i18next.d.ts @@ -13,7 +13,7 @@ interface IResourceStoreLanguage { [namespace: string]: IResourceStoreKey; } interface IResourceStoreKey { - [key: string]; + [key: string]: any; } interface I18nextOptions { diff --git a/i18next/lib/jquery.d.ts b/i18next/lib/jquery.d.ts deleted file mode 100644 index 25e2aa6266..0000000000 --- a/i18next/lib/jquery.d.ts +++ /dev/null @@ -1,758 +0,0 @@ -/* ***************************************************************************** -Copyright (c) Microsoft Corporation. All rights reserved. -Licensed under the Apache License, Version 2.0 (the "License"); you may not use -this file except in compliance with the License. You may obtain a copy of the -License at http://www.apache.org/licenses/LICENSE-2.0 - -THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED -WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, -MERCHANTABLITY OR NON-INFRINGEMENT. - -See the Apache Version 2.0 License for specific language governing permissions -and limitations under the License. -***************************************************************************** */ - -// Typing for the jQuery library, version 1.7.x - -/* - Interface for the AJAX setting that will configure the AJAX request -*/ -interface JQueryAjaxSettings { - accepts?: any; - async?: bool; - beforeSend?(jqXHR: JQueryXHR, settings: JQueryAjaxSettings); - cache?: bool; - complete?(jqXHR: JQueryXHR, textStatus: string); - contents?: { [key: string]: any; }; - contentType?: string; - context?: any; - converters?: { [key: string]: any; }; - crossDomain?: bool; - data?: any; - dataFilter?(data: any, ty: any): any; - dataType?: string; - error?(jqXHR: JQueryXHR, textStatus: string, errorThrow: string): any; - global?: bool; - headers?: { [key: string]: any; }; - ifModified?: bool; - isLocal?: bool; - jsonp?: string; - jsonpCallback?: any; - mimeType?: string; - password?: string; - processData?: bool; - scriptCharset?: string; - statusCode?: { [key: string]: any; }; - success?(data: any, textStatus: string, jqXHR: JQueryXHR); - timeout?: number; - traditional?: bool; - type?: string; - url?: string; - username?: string; - xhr?: any; - xhrFields?: { [key: string]: any; }; -} - -/* - Interface for the jqXHR object -*/ -interface JQueryXHR extends XMLHttpRequest, JQueryPromise { - overrideMimeType(mimeType: string); -} - -/* - Interface for the JQuery callback -*/ -interface JQueryCallback { - add(...callbacks: any[]): any; - disable(): any; - empty(): any; - fire(...arguments: any[]): any; - fired(): bool; - fireWith(context: any, ...args: any[]): any; - has(callback: any): bool; - lock(): any; - locked(): bool; - remove(...callbacks: any[]): any; -} - -/* - Interface for the JQuery promise, part of callbacks -*/ -interface JQueryPromise { - always(...alwaysCallbacks: any[]): JQueryDeferred; - done(...doneCallbacks: any[]): JQueryDeferred; - fail(...failCallbacks: any[]): JQueryDeferred; - progress(...progressCallbacks: any[]): JQueryDeferred; - state(): string; - pipe(doneFilter?: (...args: any[]) => any, failFilter?: (...args: any[]) => any, progressFilter?: (...args: any[]) => any): JQueryPromise; - then(doneCallbacks: any, failCallbacks: any, progressCallbacks?: any): JQueryDeferred; -} - -/* - Interface for the JQuery deferred, part of callbacks -*/ -interface JQueryDeferred extends JQueryPromise { - notify(...args: any[]): JQueryDeferred; - notifyWith(context: any, ...args: any[]): JQueryDeferred; - - pipe(doneFilter?: any, failFilter?: any, progressFilter?: any): JQueryPromise; - progress(...progressCallbacks: any[]): JQueryDeferred; - promise(target? ): JQueryDeferred; - reject(...args: any[]): JQueryDeferred; - rejectWith(context:any, ...args: any[]): JQueryDeferred; - resolve(...args: any[]): JQueryDeferred; - resolveWith(context:any, ...args: any[]): JQueryDeferred; - state(): string; - then(doneCallbacks: any, failCallbacks: any, progressCallbacks?: any): JQueryDeferred; -} - -/* - Interface of the JQuery extension of the W3C event object -*/ -interface JQueryEventObject extends Event { - data: any; - delegateTarget: Element; - isDefaultPrevented(): bool; - isImmediatePropogationStopped(): bool; - isPropogationStopped(): bool; - namespace: string; - preventDefault(): any; - relatedTarget: Element; - result: any; - stopImmediatePropagation(); - stopPropagation(); - pageX: number; - pageY: number; - which: number; - metaKey: any; -} - -/* - Collection of properties of the current browser -*/ -interface JQueryBrowserInfo { - safari:bool; - opera:bool; - msie:bool; - mozilla:bool; - webkit:bool; - version:string; -} - -interface JQuerySupport { - ajax?: bool; - boxModel?: bool; - changeBubbles?: bool; - checkClone?: bool; - checkOn?: bool; - cors?: bool; - cssFloat?: bool; - hrefNormalized?: bool; - htmlSerialize?: bool; - leadingWhitespace?: bool; - noCloneChecked?: bool; - noCloneEvent?: bool; - opacity?: bool; - optDisabled?: bool; - optSelected?: bool; - scriptEval?(): bool; - style?: bool; - submitBubbles?: bool; - tbody?: bool; -} - -/* - Static members of jQuery (those on $ and jQuery themselves) -*/ -interface JQueryStatic { - - /**** - AJAX - *****/ - ajax(settings: JQueryAjaxSettings): JQueryXHR; - ajax(url: string, settings?: JQueryAjaxSettings): JQueryXHR; - - ajaxPrefilter(dataTypes: string, handler: (opts: any, originalOpts: any, jqXHR: JQueryXHR) => any): any; - ajaxPrefilter(handler: (opts: any, originalOpts: any, jqXHR: JQueryXHR) => any): any; - - ajaxSettings: JQueryAjaxSettings; - - ajaxSetup(options: any); - - get(url: string, data?: any, success?: any, dataType?: any): JQueryXHR; - getJSON(url: string, data?: any, success?: any): JQueryXHR; - getScript(url: string, success?: any): JQueryXHR; - - param(obj: any): string; - param(obj: any, traditional: bool): string; - - post(url: string, data?: any, success?: any, dataType?: any): JQueryXHR; - - /********* - CALLBACKS - **********/ - Callbacks(flags?: string): JQueryCallback; - - /**** - CORE - *****/ - holdReady(hold: bool): any; - - (selector: string, context?: any): JQuery; - (element: Element): JQuery; - (object: { }): JQuery; - (elementArray: Element[]): JQuery; - (object: JQuery): JQuery; - (func: Function): JQuery; - (array: any[]): JQuery; - (): JQuery; - - noConflict(removeAll?: bool): Object; - - when(...deferreds: any[]): JQueryPromise; - - /*** - CSS - ****/ - css(e: any, propertyName: string, value?: any); - css(e: any, propertyName: any, value?: any); - cssHooks: { [key: string]: any; }; - cssNumber: any; - - /**** - DATA - *****/ - data(element: Element, key: string, value: any): any; - data(element: Element, key: string): any; - data(element: Element): any; - - dequeue(element: Element, queueName?: string): any; - - hasData(element: Element): bool; - - queue(element: Element, queueName?: string): any[]; - queue(element: Element, queueName: string, newQueueOrCallback: any): JQuery; - - removeData(element: Element, name?: string): JQuery; - - /******* - EFFECTS - ********/ - fx: { tick: () => void; interval: number; stop: () => void; speeds: { slow: number; fast: number; }; off: bool; step: any; }; - - /****** - EVENTS - *******/ - proxy(fn: Function, context: any): any; - proxy(context: any, name: any): any; - Deferred(): JQueryDeferred; - - /********* - INTERNALS - **********/ - error(message: any); - - /************* - MISCELLANEOUS - **************/ - expr: any; - fn: any; //TODO: Decide how we want to type this - isReady: bool; - - /********** - PROPERTIES - ***********/ - browser: JQueryBrowserInfo; - support: JQuerySupport; - - /********* - UTILITIES - **********/ - contains(container: Element, contained: Element): bool; - - each(collection: any, callback: (indexInArray: any, valueOfElement: any) => any): any; - - extend(target: any, ...objs: any[]): Object; - extend(deep: bool, target: any, ...objs: any[]): Object; - - globalEval(code: string): any; - - grep(array: any[], func: any, invert?: bool): any[]; - - inArray(value: any, array: any[], fromIndex?: number): number; - - isArray(obj: any): bool; - isEmptyObject(obj: any): bool; - isFunction(obj: any): bool; - isNumeric(value: any): bool; - isPlainObject(obj: any): bool; - isWindow(obj: any): bool; - isXMLDoc(node: Node): bool; - - makeArray(obj: any): any[]; - - map(array: any[], callback: (elementOfArray: any, indexInArray: any) =>any): any[]; - - merge(first: any[], second: any[]): any[]; - - noop(): any; - - now(): number; - - parseJSON(json: string): Object; - - //FIXME: This should return an XMLDocument - parseXML(data: string): any; - - queue(element: Element, queueName: string, newQueue: any[]): JQuery; - - trim(str: string): string; - - type(obj: any): string; - - unique(arr: any[]): any[]; -} - -/* - The jQuery instance members -*/ -interface JQuery { - /**** - AJAX - *****/ - ajaxComplete(handler: any): JQuery; - ajaxError(handler: (event: any, jqXHR: any, settings: any, exception: any) => any): JQuery; - ajaxSend(handler: (event: any, jqXHR: any, settings: any, exception: any) => any): JQuery; - ajaxStart(handler: () => any): JQuery; - ajaxStop(handler: () => any): JQuery; - ajaxSuccess(handler: (event: any, jqXHR: any, settings: any, exception: any) => any): JQuery; - - load(url: string, data?: any, complete?: any): JQuery; - - serialize(): string; - serializeArray(): any[]; - - /********** - ATTRIBUTES - ***********/ - addClass(classNames: string): JQuery; - addClass(func: (index: any, currentClass: any) => string): JQuery; - - attr(attributeName: string): string; - attr(attributeName: string, value: any): JQuery; - attr(map: { [key: string]: any; }): JQuery; - attr(attributeName: string, func: (index: any, attr: any) => any): JQuery; - - hasClass(className: string): bool; - - html(): string; - html(htmlString: string): JQuery; - html(htmlContent: (index: number, oldhtml: string) => string): JQuery; - - prop(propertyName: string): any; - prop(propertyName: string, value: any): JQuery; - prop(map: any): JQuery; - prop(propertyName: string, func: (index: any, oldPropertyValue: any) => any): JQuery; - - removeAttr(attributeName: any): JQuery; - - removeClass(className?: any): JQuery; - removeClass(func: (index: any, cls: any) => any): JQuery; - - removeProp(propertyName: any): JQuery; - - toggleClass(className: any, swtch?: bool): JQuery; - toggleClass(swtch?: bool): JQuery; - toggleClass(func: (index: any, cls: any, swtch: any) => any): JQuery; - - val(): any; - val(value: string[]): JQuery; - val(value: string): JQuery; - val(value: number): JQuery; - val(func: (index: any, value: any) => any): JQuery; - - /*** - CSS - ****/ - css(propertyName: string, value?: any): any; - css(propertyName: any, value?: any): any; - - height(): number; - height(value: number): JQuery; - height(value: string): JQuery; - height(func: (index: any, height: any) => any): JQuery; - - innerHeight(): number; - innerWidth(): number; - - offset(): { left: number; top: number; }; - offset(coordinates: any): JQuery; - offset(func: (index: any, coords: any) => any): JQuery; - - outerHeight(includeMargin?: bool): number; - outerWidth(includeMargin?: bool): number; - - position(): { top: number; left: number; }; - - scrollLeft(): number; - scrollLeft(value: number): JQuery; - - scrollTop(): number; - scrollTop(value: number): JQuery; - - width(): number; - width(value: number): JQuery; - width(value: string): JQuery; - width(func: (index: any, height: any) => any): JQuery; - - /**** - DATA - *****/ - clearQueue(queueName?: string): JQuery; - - data(key: string, value: any): JQuery; - data(obj: { [key: string]: any; }): JQuery; - data(key?: string): any; - - dequeue(queueName?: string): JQuery; - - removeData(nameOrList?: any): JQuery; - - /******** - DEFERRED - *********/ - promise(type?: any, target?: any): JQueryPromise; - - /******* - EFFECTS - ********/ - animate(properties: any, duration?: any, complete?: Function): JQuery; - animate(properties: any, duration?: any, easing?: string, complete?: Function): JQuery; - animate(properties: any, options: { duration?: any; easing?: string; complete?: Function; step?: Function; queue?: bool; specialEasing?: any; }); - - delay(duration: number, queueName?: string): JQuery; - - fadeIn(duration?: any, callback?: any): JQuery; - fadeIn(duration?: any, easing?: string, callback?: any): JQuery; - - fadeOut(duration?: any, callback?: any): JQuery; - fadeOut(duration?: any, easing?: string, callback?: any): JQuery; - - fadeTo(duration: any, opacity: number, callback?: any): JQuery; - fadeTo(duration: any, opacity: number, easing?: string, callback?: any): JQuery; - - fadeToggle(duration?: any, callback?: any): JQuery; - fadeToggle(duration?: any, easing?: string, callback?: any): JQuery; - - hide(duration?: any, callback?: any): JQuery; - hide(duration?: any, easing?: string, callback?: any): JQuery; - - show(duration?: any, callback?: any): JQuery; - show(duration?: any, easing?: string, callback?: any): JQuery; - - slideDown(duration?: any, callback?: any): JQuery; - slideDown(duration?: any, easing?: string, callback?: any): JQuery; - - slideToggle(duration?: any, callback?: any): JQuery; - slideToggle(duration?: any, easing?: string, callback?: any): JQuery; - - slideUp(duration?: any, callback?: any): JQuery; - slideUp(duration?: any, easing?: string, callback?: any): JQuery; - - stop(clearQueue?: bool, jumpToEnd?: bool): JQuery; - stop(queue?:any, clearQueue?: bool, jumpToEnd?: bool): JQuery; - - toggle(duration?: any, callback?: any): JQuery; - toggle(duration?: any, easing?: string, callback?: any): JQuery; - toggle(showOrHide: bool): JQuery; - - /****** - EVENTS - *******/ - bind(eventType: string, eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - bind(eventType: string, eventData: any, preventBubble:bool): JQuery; - bind(eventType: string, preventBubble:bool): JQuery; - bind(...events: any[]); - - blur(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - blur(handler: (eventObject: JQueryEventObject) => any): JQuery; - - change(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - change(handler: (eventObject: JQueryEventObject) => any): JQuery; - - click(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - click(handler: (eventObject: JQueryEventObject) => any): JQuery; - - dblclick(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - dblclick(handler: (eventObject: JQueryEventObject) => any): JQuery; - - delegate(selector: any, eventType: string, handler: (eventObject: JQueryEventObject) => any): JQuery; - - focus(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - focus(handler: (eventObject: JQueryEventObject) => any): JQuery; - - focusin(eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery; - focusin(handler: (eventObject: JQueryEventObject) => any): JQuery; - - focusout(eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery; - focusout(handler: (eventObject: JQueryEventObject) => any): JQuery; - - hover(handlerIn: (eventObject: JQueryEventObject) => any, handlerOut: (eventObject: JQueryEventObject) => any): JQuery; - hover(handlerInOut: (eventObject: JQueryEventObject) => any): JQuery; - - keydown(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - keydown(handler: (eventObject: JQueryEventObject) => any): JQuery; - - keypress(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - keypress(handler: (eventObject: JQueryEventObject) => any): JQuery; - - keyup(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - keyup(handler: (eventObject: JQueryEventObject) => any): JQuery; - - load(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - load(handler: (eventObject: JQueryEventObject) => any): JQuery; - - mousedown(): JQuery; - mousedown(eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery; - mousedown(handler: (eventObject: JQueryEventObject) => any): JQuery; - - mouseevent(eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery; - mouseevent(handler: (eventObject: JQueryEventObject) => any): JQuery; - - mouseenter(): JQuery; - mouseenter(eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery; - mouseenter(handler: (eventObject: JQueryEventObject) => any): JQuery; - - mouseleave(): JQuery; - mouseleave(eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery; - mouseleave(handler: (eventObject: JQueryEventObject) => any): JQuery; - - mousemove(): JQuery; - mousemove(eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery; - mousemove(handler: (eventObject: JQueryEventObject) => any): JQuery; - - mouseout(): JQuery; - mouseout(eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery; - mouseout(handler: (eventObject: JQueryEventObject) => any): JQuery; - - mouseover(): JQuery; - mouseover(eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery; - mouseover(handler: (eventObject: JQueryEventObject) => any): JQuery; - - mouseup(): JQuery; - mouseup(eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery; - mouseup(handler: (eventObject: JQueryEventObject) => any): JQuery; - - off(events?: string, selector?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - off(eventsMap: { [key: string]: any; }, selector?: any): JQuery; - - on(events: string, selector?: any, data?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - on(eventsMap: { [key: string]: any; }, selector?: any, data?: any): JQuery; - - one(events: string, selector?: any, data?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - one(eventsMap: { [key: string]: any; }, selector?: any, data?: any): JQuery; - - ready(handler: any): JQuery; - - resize(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - resize(handler: (eventObject: JQueryEventObject) => any): JQuery; - - scroll(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - scroll(handler: (eventObject: JQueryEventObject) => any): JQuery; - - select(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - select(handler: (eventObject: JQueryEventObject) => any): JQuery; - - submit(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - submit(handler: (eventObject: JQueryEventObject) => any): JQuery; - - trigger(eventType: string, ...extraParameters: any[]): JQuery; - trigger(event: JQueryEventObject): JQuery; - - triggerHandler(eventType: string, ...extraParameters: any[]): Object; - - unbind(eventType?: string, handler?: (eventObject: JQueryEventObject) => any): JQuery; - unbind(eventType: string, fls: bool): JQuery; - unbind(evt: any): JQuery; - - undelegate(): JQuery; - undelegate(selector: any, eventType: string, handler?: (eventObject: JQueryEventObject) => any): JQuery; - undelegate(selector: any, events: any): JQuery; - undelegate(namespace: string): JQuery; - - unload(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery; - unload(handler: (eventObject: JQueryEventObject) => any): JQuery; - - /********* - INTERNALS - **********/ - - context: Element; - jquery: string; - - error(handler: (eventObject: JQueryEventObject) => any): JQuery; - error(eventData: any, handler: (eventObject: JQueryEventObject) => any): JQuery; - - pushStack(elements: any[]): JQuery; - pushStack(elements: any[], name: any, arguments: any): JQuery; - - /************ - MANIPULATION - *************/ - after(...content: any[]): JQuery; - after(func: (index: any) => any); - - append(...content: any[]): JQuery; - append(func: (index: any, html: any) => any); - - appendTo(target: any): JQuery; - - before(...content: any[]): JQuery; - before(func: (index: any) => any); - - clone(withDataAndEvents?: bool, deepWithDataAndEvents?: bool): JQuery; - - detach(selector?: any): JQuery; - - empty(): JQuery; - - insertAfter(target: any): JQuery; - insertBefore(target: any): JQuery; - - prepend(...content: any[]): JQuery; - prepend(func: (index: any, html: any) =>any): JQuery; - - prependTo(target: any): JQuery; - - remove(selector?: any): JQuery; - - replaceAll(target: any): JQuery; - - replaceWith(func: any): JQuery; - - text(): string; - text(textString: any): JQuery; - text(textString: (index: number, text: string) => string): JQuery; - - toArray(): any[]; - - unwrap(): JQuery; - - wrap(wrappingElement: any): JQuery; - wrap(func: (index: any) =>any): JQuery; - - wrapAll(wrappingElement: any): JQuery; - - wrapInner(wrappingElement: any): JQuery; - wrapInner(func: (index: any) =>any): JQuery; - - /************* - MISCELLANEOUS - **************/ - each(func: (index: any, elem: Element) => any); - - get(index?: number): any; - - index(): number; - index(selector: string): number; - index(element: any): number; - - /********** - PROPERTIES - ***********/ - length: number; - [x: string]: HTMLElement; - [x: number]: HTMLElement; - - /********** - TRAVERSING - ***********/ - add(selector: string, context?: any): JQuery; - add(...elements: any[]): JQuery; - add(html: string): JQuery; - add(obj: JQuery): JQuery; - - andSelf(): JQuery; - - children(selector?: any): JQuery; - - closest(selector: string): JQuery; - closest(selector: string, context?: Element): JQuery; - closest(obj: JQuery): JQuery; - closest(element: any): JQuery; - closest(selectors: any, context?: Element): any[]; - - contents(): JQuery; - - end(): JQuery; - - eq(index: number): JQuery; - - filter(selector: string): JQuery; - filter(func: (index: any) =>any): JQuery; - filter(element: any): JQuery; - filter(obj: JQuery): JQuery; - - find(selector: string): JQuery; - find(element: any): JQuery; - find(obj: JQuery): JQuery; - - first(): JQuery; - - has(selector: string): JQuery; - has(contained: Element): JQuery; - - is(selector: string): bool; - is(func: (index: any) =>any): bool; - is(element: any): bool; - is(obj: JQuery): bool; - - last(): JQuery; - - map(callback: (index: any, domElement: Element) =>any): JQuery; - - next(selector?: string): JQuery; - - nextAll(selector?: string): JQuery; - - nextUntil(selector?: string, filter?: string): JQuery; - nextUntil(element?: Element, filter?: string): JQuery; - - not(selector: string): JQuery; - not(func: (index: any) =>any): JQuery; - not(element: any): JQuery; - not(obj: JQuery): JQuery; - - offsetParent(): JQuery; - - parent(selector?: string): JQuery; - - parents(selector?: string): JQuery; - - parentsUntil(selector?: string, filter?: string): JQuery; - parentsUntil(element?: Element, filter?: string): JQuery; - - prev(selector?: string): JQuery; - - prevAll(selector?: string): JQuery; - - prevUntil(selector?: string, filter?:string): JQuery; - prevUntil(element?: Element, filter?:string): JQuery; - - siblings(selector?: string): JQuery; - - slice(start: number, end?: number): JQuery; - - /********* - UTILITIES - **********/ - - queue(queueName?: string): any[]; - queue(queueName: string, newQueueOrCallback: any): JQuery; - queue(newQueueOrCallback: any): JQuery; -} - -declare var jQuery: JQueryStatic; -declare var $: JQueryStatic; diff --git a/i18next/lib/mocha.d.ts b/i18next/lib/mocha.d.ts deleted file mode 100644 index ee31e689d3..0000000000 --- a/i18next/lib/mocha.d.ts +++ /dev/null @@ -1,44 +0,0 @@ -// BDD -declare function describe(cb: () => void); -declare function describe(cb: (done:() => void) => void); -declare function describe(title: string, cb: () => void); -declare function describe(title: string, cb: (done:() => void) => void); - -declare function it(cb: () => void); -declare function it(cb: (done:() => void) => void); -declare function it(title: string, cb: () => void); -declare function it(title: string, cb: (done:() => void) => void); - -declare function before(cb: () => void); -declare function before(cb: (done:() => void) => void); -declare function before(title: string, cb: () => void); -declare function before(title: string, cb: (done:() => void) => void); - -declare function after(cb: () => void); -declare function after(cb: (done:() => void) => void); -declare function after(title: string, cb: () => void); -declare function after(title: string, cb: (done:() => void) => void); - -declare function beforeEach(cb: () => void); -declare function beforeEach(cb: (done:() => void) => void); -declare function beforeEach(title: string, cb: () => void); -declare function beforeEach(title: string, cb: (done:() => void) => void); - -declare function afterEach(cb: () => void); -declare function afterEach(cb: (done:() => void) => void); -declare function afterEach(title: string, cb: () => void); -declare function afterEach(title: string, cb: (done:() => void) => void); - - -// TDD -declare function suite(title: string, cb: () => void); -declare function test(title: string, cb: () => void); -declare function test(title: string, cb: (done:() => void) => void); -declare function setup(title: string, cb: () => void); -declare function teardown(title: string, cb: () => void); - -declare function suite(cb: () => void); -declare function test(cb: () => void); -declare function test(cb: (done:() => void) => void); -declare function setup(cb: () => void); -declare function teardown(cb: () => void); diff --git a/i18next/lib/sinon.d.ts b/i18next/lib/sinon.d.ts deleted file mode 100644 index 25198e3b36..0000000000 --- a/i18next/lib/sinon.d.ts +++ /dev/null @@ -1,33 +0,0 @@ -/// - -interface spy { - called: bool; - getCall(x: number): any; - fakeServer: ISinonFakeServer; - calledOnce: bool; - calledWith(x: any, message: string): bool; -} - -interface IJsonReponse { - responseCode: number; - responseHeaders: any; - responseString: string; -} - -interface ISinonFakeServer { - create(): any; - restore(): void; - respondWith(postType: string, relativeUrl: string, x: any): any; - respond(): any; -} - -declare module sinon { - export function spy(): spy; - export function spy(fn: Function): spy; - //export function spy(jquery: JQueryStatic , x: string): spy; - export function spy(jquery: JQueryStatic , x: any): spy; - export function spy(obj: Object , methodName: string): spy; - export var fakeServer: ISinonFakeServer; - export function stub(x: any, name: string); - export function useFakeTimers(): void; -} \ No newline at end of file diff --git a/js-fixtures/fixtures.d.ts b/js-fixtures/fixtures.d.ts index 912bc693c1..92bd548e0e 100644 --- a/js-fixtures/fixtures.d.ts +++ b/js-fixtures/fixtures.d.ts @@ -3,7 +3,7 @@ // Definitions by: Kazi Manzur Rashid // DefinitelyTyped: https://github.com/borisyankov/DefinitelyTyped -declare interface Fixtures { +interface Fixtures { path: string; containerId: string; body(): string; diff --git a/sinon/sinon-1.5.d.ts b/sinon/sinon-1.5.d.ts index cb776563ad..ed423515e6 100644 --- a/sinon/sinon-1.5.d.ts +++ b/sinon/sinon-1.5.d.ts @@ -387,4 +387,4 @@ interface SinonStatic { log: (message: string) => void; } -var sinon: SinonStatic; +declare var sinon: SinonStatic; From 18628d14904e2bc1b32579f857620d4914d69f51 Mon Sep 17 00:00:00 2001 From: Neil Stalker Date: Fri, 21 Jun 2013 16:03:05 +0100 Subject: [PATCH 3/5] fix chai, chai-jquery and sinon-chai for TS 0.9 --- chai-jquery/chai-jquery-tests.ts | 4 ++-- chai/{chai-assert-test.ts => chai-assert-tests.ts} | 4 ++-- chai/chai-tests.ts | 1 - chai/chai.d.ts | 6 +----- sinon-chai/sinon-chai-tests.ts | 4 ++-- 5 files changed, 7 insertions(+), 12 deletions(-) rename chai/{chai-assert-test.ts => chai-assert-tests.ts} (99%) diff --git a/chai-jquery/chai-jquery-tests.ts b/chai-jquery/chai-jquery-tests.ts index fbd05480ec..97ed7a36a7 100644 --- a/chai-jquery/chai-jquery-tests.ts +++ b/chai-jquery/chai-jquery-tests.ts @@ -1,5 +1,5 @@ -///  -///  +/// +/// declare var $; var expect = chai.expect; diff --git a/chai/chai-assert-test.ts b/chai/chai-assert-tests.ts similarity index 99% rename from chai/chai-assert-test.ts rename to chai/chai-assert-tests.ts index b4a5a15be7..19429b4c92 100644 --- a/chai/chai-assert-test.ts +++ b/chai/chai-assert-tests.ts @@ -330,7 +330,7 @@ suite('assert', function () { test('isArray', function () { assert.isArray([]); - assert.isArray(new Array); + assert.isArray(new Array()); err(function () { assert.isArray({}); @@ -345,7 +345,7 @@ suite('assert', function () { }, "expected [] not to be an array"); err(function () { - assert.isNotArray(new Array); + assert.isNotArray(new Array()); }, "expected [] not to be an array"); }); diff --git a/chai/chai-tests.ts b/chai/chai-tests.ts index 3774e38952..ab26aadbcf 100644 --- a/chai/chai-tests.ts +++ b/chai/chai-tests.ts @@ -1,6 +1,5 @@ /// -var chai: chai; var expect = chai.expect; function test_be() { diff --git a/chai/chai.d.ts b/chai/chai.d.ts index f746737279..6a9010322f 100644 --- a/chai/chai.d.ts +++ b/chai/chai.d.ts @@ -116,10 +116,6 @@ declare module chai { to: To; } + function expect(target: any): chai.ExpectMatchers; } -interface chai { - expect: { - (target: any): chai.ExpectMatchers; - } -} diff --git a/sinon-chai/sinon-chai-tests.ts b/sinon-chai/sinon-chai-tests.ts index 1ada034de1..e4de0f5a40 100644 --- a/sinon-chai/sinon-chai-tests.ts +++ b/sinon-chai/sinon-chai-tests.ts @@ -1,5 +1,5 @@ -///  -///  +/// +/// var expect = chai.expect; From 25127bf917f1c0073051dadfc54e66c2fa845408 Mon Sep 17 00:00:00 2001 From: Neil Stalker Date: Fri, 21 Jun 2013 16:08:00 +0100 Subject: [PATCH 4/5] fix cheerio for TS 0.9 --- cheerio/{cheerio-test.ts => cheerio-tests.ts} | 130 +++++++++--------- cheerio/cheerio.d.ts | 6 +- 2 files changed, 68 insertions(+), 68 deletions(-) rename cheerio/{cheerio-test.ts => cheerio-tests.ts} (93%) diff --git a/cheerio/cheerio-test.ts b/cheerio/cheerio-tests.ts similarity index 93% rename from cheerio/cheerio-test.ts rename to cheerio/cheerio-tests.ts index b2a5d84f3b..00cc95ee8b 100644 --- a/cheerio/cheerio-test.ts +++ b/cheerio/cheerio-tests.ts @@ -1,65 +1,65 @@ -/// - -import cheerio = module("cheerio"); - -var $ = cheerio.load(""); -var $el = $('selector'); -var $multiEl = $('seletor', 'selector', 'selector'); - -$el.addClass("class").addClass("test"); -$el.hasClass("test"); -$el.removeClass("class").removeClass("test"); - -$el.attr('class'); -$el.attr('class', 'test'); -$el.removeAttr("class").removeAttr("test"); - -$el.find("ul").find("> li"); - -$el.parent().parent(); -$el.next().next(); -$el.prev().prev(); -$el.siblings().siblings(); - -$el.children().children(); -$el.children("li").children("a"); - -$el.children().each((index, element) => { - $(element).find('t'); -}); - -$el.children().map((index, element) => { - return $(element).find('t'); -}); - -$el.children().filter((index) => { - return $el.children().eq(index).find('t'); -}); - -$el.filter('span').filter('li'); - -$el.first().last().find('t'); - -$('div').eq(0).find('b'); - -$('#id').append("test html", "other html").find('a'); -$('#id').prepend("test html", "other html").find('a'); -$('#id').after("test html", "other html").find('a'); -$('#id').before("test html", "other html").find('a'); - -$el.remove('div').remove('a'); - -$('#id').replaceWith('some html').parent(); -$('#id').empty().parent(); - -$el.html(); -$el.html("").find('div'); - -$el.text(); -$el.text('some text'); - -$el.toArray(); -$el.clone().find('a').parent(); -$el.root().find('a'); - -$el.dom(); +/// + +import cheerio = module("cheerio"); + +var $ = cheerio.load(""); +var $el = $('selector'); +var $multiEl = $('seletor', 'selector', 'selector'); + +$el.addClass("class").addClass("test"); +$el.hasClass("test"); +$el.removeClass("class").removeClass("test"); + +$el.attr('class'); +$el.attr('class', 'test'); +$el.removeAttr("class").removeAttr("test"); + +$el.find("ul").find("> li"); + +$el.parent().parent(); +$el.next().next(); +$el.prev().prev(); +$el.siblings().siblings(); + +$el.children().children(); +$el.children("li").children("a"); + +$el.children().each((index, element) => { + return $(element).find('t'); +}); + +$el.children().map((index, element) => { + return $(element).find('t'); +}); + +$el.children().filter((index) => { + return $el.children().eq(index).find('t'); +}); + +$el.filter('span').filter('li'); + +$el.first().last().find('t'); + +$('div').eq(0).find('b'); + +$('#id').append("test html", "other html").find('a'); +$('#id').prepend("test html", "other html").find('a'); +$('#id').after("test html", "other html").find('a'); +$('#id').before("test html", "other html").find('a'); + +$el.remove('div').remove('a'); + +$('#id').replaceWith('some html').parent(); +$('#id').empty().parent(); + +$el.html(); +$el.html("").find('div'); + +$el.text(); +$el.text('some text'); + +$el.toArray(); +$el.clone().find('a').parent(); +$el.root().find('a'); + +$el.dom(); diff --git a/cheerio/cheerio.d.ts b/cheerio/cheerio.d.ts index cbf9e12daf..8bb7307c0d 100644 --- a/cheerio/cheerio.d.ts +++ b/cheerio/cheerio.d.ts @@ -4,7 +4,7 @@ // Definitions: https://github.com/borisyankov/DefinitelyTyped -declare interface Cheerio { +interface Cheerio { addClass(classNames: string): Cheerio; hasClass(className: string): bool; @@ -65,13 +65,13 @@ declare interface Cheerio { } -declare interface CheerioOptionsInterface { +interface CheerioOptionsInterface { ignoreWhitespace?: bool; xmlMode?: bool; lowerCaseTags?: bool; } -declare interface CheerioStatic { +interface CheerioStatic { (...selectors: any[]): Cheerio; (): Cheerio; } From dc8c737177467576250e0a0c99a0abab9ad54522 Mon Sep 17 00:00:00 2001 From: Neil Stalker Date: Fri, 21 Jun 2013 17:02:20 +0100 Subject: [PATCH 5/5] fix ace editor definition and tests for 0.9 --- ace/ace.d.ts | 36 ++++---- ace/tests/ace-anchor-tests.ts | 3 +- ace/tests/ace-background_tokenizer-tests.ts | 4 +- ace/tests/ace-default-tests.ts | 1 + ace/tests/ace-document-tests.ts | 3 +- ace/tests/ace-edit_session-tests.ts | 3 +- ace/tests/ace-editor1-tests.ts | 3 +- ...ce-editor_highlight_selected_word-tests.ts | 29 +++--- ace/tests/ace-editor_navigation-tests.ts | 18 ++-- ace/tests/ace-editor_text_edit-tests.ts | 89 ++++++++++--------- ace/tests/ace-multi_select-tests.ts | 13 +-- ace/tests/ace-placeholder-tests.ts | 29 +++--- ace/tests/ace-range-tests.ts | 3 +- ace/tests/ace-range_list-tests.ts | 3 +- ace/tests/ace-search-tests.ts | 3 +- ace/tests/ace-selection-tests.ts | 3 +- ace/tests/ace-token_iterator-tests.ts | 12 +-- ace/tests/ace-virtual_renderer-tests.ts | 3 +- 18 files changed, 143 insertions(+), 115 deletions(-) diff --git a/ace/ace.d.ts b/ace/ace.d.ts index fe31dcc206..6a8e816253 100644 --- a/ace/ace.d.ts +++ b/ace/ace.d.ts @@ -3,7 +3,7 @@ // Definitions by: Diullei Gomes // Definitions: https://github.com/borisyankov/DefinitelyTyped -module AceAjax { +declare module AceAjax { export interface Delta { action: string; @@ -75,7 +75,7 @@ module AceAjax { onTextInput(text); } - declare var KeyBinding: { + var KeyBinding: { new(editor: Editor): KeyBinding; } @@ -184,7 +184,7 @@ module AceAjax { **/ detach(); } - declare var Anchor: { + var Anchor: { /** * Creates a new `Anchor` and associates it with a document. * @param doc The document to associate with the anchor @@ -248,7 +248,7 @@ module AceAjax { **/ getState(row: number): string; } - declare var BackgroundTokenizer: { + var BackgroundTokenizer: { /** * Creates a new `BackgroundTokenizer` object. * @param tokenizer The tokenizer to use @@ -435,7 +435,7 @@ module AceAjax { **/ positionToIndex(pos: Position, startRow: number): number; } - declare var Document: { + var Document: { /** * Creates a new `Document`. If `text` is included, the `Document` contains those strings; otherwise, it's empty. * @param text The starting text @@ -1011,7 +1011,7 @@ module AceAjax { **/ getScreenLength(): number; } - declare var EditSession: { + var EditSession: { /** * Sets up a new `EditSession` and associates it with the given `Document` and `TextMode`. * @param text [If `text` is a `Document`, it associates the `EditSession` with it. Otherwise, a new `Document` is created, with the initial text]{: #textParam} @@ -1702,7 +1702,7 @@ module AceAjax { } - declare var Editor: { + var Editor: { /** * Creates a new `Editor` object. * @param renderer Associated `VirtualRenderer` that draws everything @@ -1761,7 +1761,7 @@ module AceAjax { **/ cancel(); } - declare var PlaceHolder: { + var PlaceHolder: { /** * - @param session (Document): The document to associate with the anchor * - @param length (Number): The starting row position @@ -1995,7 +1995,7 @@ module AceAjax { * @param endRow The ending row * @param endColumn The ending column **/ - declare var Range: { + var Range: { fromPoints(pos1: Position, pos2: Position): Range; new(startRow: number, startColumn: number, endRow: number, endColumn: number): Range; } @@ -2005,7 +2005,7 @@ module AceAjax { //////////////// export interface RenderLoop { } - declare var RenderLoop: { + var RenderLoop: { new(): RenderLoop; } @@ -2047,7 +2047,7 @@ module AceAjax { **/ setScrollTop(scrollTop: number); } - declare var ScrollBar: { + var ScrollBar: { /** * Creates a new `ScrollBar`. `parent` is the owner of the scroll bar. * @param parent A DOM element @@ -2102,7 +2102,7 @@ module AceAjax { **/ replace(input: string, replacement: string): string; } - declare var Search: { + var Search: { /** * Creates a new `Search` object. The following search options are avaliable: * - `needle`: The string or regular expression you're looking for @@ -2371,7 +2371,7 @@ module AceAjax { **/ moveCursorToScreen(row: number, column: number, keepDesiredColumn: boolean); } - declare var Selection: { + var Selection: { /** * Creates a new `Selection` object. * @param session The session to use @@ -2459,7 +2459,7 @@ module AceAjax { **/ resize(); } - declare var Split: { + var Split: { new(): Split; } @@ -2497,7 +2497,7 @@ module AceAjax { **/ getCurrentTokenColumn(): number; } - declare var TokenIterator: { + var TokenIterator: { /** * Creates a new token iterator object. The inital token index is set to the provided row and column coordinates. * @param session The session to associate with @@ -2522,7 +2522,7 @@ module AceAjax { **/ getLineTokens(): any; } - declare var Tokenizer: { + var Tokenizer: { /** * Constructs a new tokenizer based on the given rules and flags. * @param rules The highlighting rules @@ -2576,7 +2576,7 @@ module AceAjax { hasRedo(): boolean; } - declare var UndoManager: { + var UndoManager: { /** * Resets the current undo state and creates a new `UndoManager`. **/ @@ -2924,7 +2924,7 @@ module AceAjax { destroy(); } - declare var VirtualRenderer: { + var VirtualRenderer: { /** * Constructs a new `VirtualRenderer` within the `container` specified, applying the given `theme`. * @param container The root element of the editor diff --git a/ace/tests/ace-anchor-tests.ts b/ace/tests/ace-anchor-tests.ts index 40e81600ab..08ca8f43fc 100644 --- a/ace/tests/ace-anchor-tests.ts +++ b/ace/tests/ace-anchor-tests.ts @@ -1,6 +1,7 @@ /// -exports = { +var assert: any; +var exports = { "test create anchor" : function() { var doc = new AceAjax.Document("juhu"); diff --git a/ace/tests/ace-background_tokenizer-tests.ts b/ace/tests/ace-background_tokenizer-tests.ts index 8c29358a40..8f54bae51c 100644 --- a/ace/tests/ace-background_tokenizer-tests.ts +++ b/ace/tests/ace-background_tokenizer-tests.ts @@ -1,5 +1,7 @@ /// +var assert: any; + function forceTokenize(session) { for (var i = 0, l = session.getLength(); i < l; i++) session.getTokens(i) @@ -11,7 +13,7 @@ function testStates(session, states) { assert.ok(l == states.length) } -exports = { +var exports = { "test background tokenizer update on session change": function() { var doc = new AceAjax.EditSession([ diff --git a/ace/tests/ace-default-tests.ts b/ace/tests/ace-default-tests.ts index dcd1ab1033..f8a280c1a2 100644 --- a/ace/tests/ace-default-tests.ts +++ b/ace/tests/ace-default-tests.ts @@ -1,5 +1,6 @@ /// +var assert: any; var editor = ace.edit("editor"); editor.setTheme("ace/theme/monokai"); editor.getSession().setMode("ace/mode/javascript"); diff --git a/ace/tests/ace-document-tests.ts b/ace/tests/ace-document-tests.ts index 1f3e0a9a24..7fc342f746 100644 --- a/ace/tests/ace-document-tests.ts +++ b/ace/tests/ace-document-tests.ts @@ -1,6 +1,7 @@ /// -exports = { +var assert: any; +var exports = { "test: insert text in line": function() { var doc = new AceAjax.Document(["12", "34"]); diff --git a/ace/tests/ace-edit_session-tests.ts b/ace/tests/ace-edit_session-tests.ts index 12a3ce5bf3..caa2f1729a 100644 --- a/ace/tests/ace-edit_session-tests.ts +++ b/ace/tests/ace-edit_session-tests.ts @@ -1,6 +1,7 @@ /// var lang: any; +var assert: any; function createFoldTestSession() { var lines = [ @@ -26,7 +27,7 @@ function assertArray(a, b) { } } -exports = { +var exports = { "test: find matching opening bracket in Text mode": function() { var session = new AceAjax.EditSession(["(()(", "())))"]); diff --git a/ace/tests/ace-editor1-tests.ts b/ace/tests/ace-editor1-tests.ts index ed8b3b3e86..78d3aff044 100644 --- a/ace/tests/ace-editor1-tests.ts +++ b/ace/tests/ace-editor1-tests.ts @@ -1,6 +1,7 @@ /// -exports = { +var assert: any; +var exports = { setUp: function(next) { this.session1 = new AceAjax.EditSession(["abc", "def"]); diff --git a/ace/tests/ace-editor_highlight_selected_word-tests.ts b/ace/tests/ace-editor_highlight_selected_word-tests.ts index 7e06c8c50c..e02f32366a 100644 --- a/ace/tests/ace-editor_highlight_selected_word-tests.ts +++ b/ace/tests/ace-editor_highlight_selected_word-tests.ts @@ -27,10 +27,13 @@ function callHighlighterUpdate(session: AceAjax.IEditSession, firstRow: number, return rangeCount; } -exports = { +var assert: any; +var renderer: AceAjax.VirtualRenderer; + +var exports = { setUp: function(next) { var session = new AceAjax.EditSession(lipsum); - editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); var selection = session.getSelection(); next(); } , @@ -38,7 +41,7 @@ exports = { "test: highlight selected words by default": function () { var selection = session.getSelection(); var session = new AceAjax.EditSession(lipsum); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); assert.equal(editor.getHighlightSelectedWord(), true); } , @@ -46,7 +49,7 @@ exports = { "test: highlight a word": function () { var selection = session.getSelection(); var session = new AceAjax.EditSession(lipsum); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(0, 9); selection.selectWord(); @@ -63,7 +66,7 @@ exports = { "test: highlight a word and clear highlight": function () { var selection = session.getSelection(); var session = new AceAjax.EditSession(lipsum); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(0, 8); selection.selectWord(); @@ -79,7 +82,7 @@ exports = { "test: highlight another word": function () { var selection = session.getSelection(); var session = new AceAjax.EditSession(lipsum); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); selection.moveCursorTo(0, 14); selection.selectWord(); @@ -92,7 +95,7 @@ exports = { "test: no selection, no highlight": function () { var selection = session.getSelection(); var session = new AceAjax.EditSession(lipsum); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); selection.clearSelection(); assert.equal(callHighlighterUpdate(session, 0, 0), 0); @@ -101,7 +104,7 @@ exports = { "test: select a word, no highlight": function () { var selection = session.getSelection(); var session = new AceAjax.EditSession(lipsum); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); selection.moveCursorTo(0, 14); selection.selectWord(); @@ -116,7 +119,7 @@ exports = { "test: select a word with no matches": function () { var selection = session.getSelection(); var session = new AceAjax.EditSession(lipsum); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.setHighlightSelectedWord(true); @@ -143,7 +146,7 @@ exports = { "test: partial word selection 1": function () { var selection = session.getSelection(); var session = new AceAjax.EditSession(lipsum); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); selection.moveCursorTo(0, 14); selection.selectWord(); @@ -157,7 +160,7 @@ exports = { "test: partial word selection 2": function () { var selection = session.getSelection(); var session = new AceAjax.EditSession(lipsum); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); selection.moveCursorTo(0, 13); selection.selectWord(); @@ -171,7 +174,7 @@ exports = { "test: partial word selection 3": function () { var selection = session.getSelection(); var session = new AceAjax.EditSession(lipsum); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); selection.moveCursorTo(0, 14); selection.selectWord(); @@ -186,7 +189,7 @@ exports = { "test: select last word": function () { var selection = session.getSelection(); var session = new AceAjax.EditSession(lipsum); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); selection.moveCursorTo(0, 1); diff --git a/ace/tests/ace-editor_navigation-tests.ts b/ace/tests/ace-editor_navigation-tests.ts index c97ee0cd21..b68ae9b9dc 100644 --- a/ace/tests/ace-editor_navigation-tests.ts +++ b/ace/tests/ace-editor_navigation-tests.ts @@ -1,6 +1,8 @@ /// -exports = { +var assert: any; +var renderer: AceAjax.VirtualRenderer; +var exports = { createEditSession: function (rows, cols) { var line = new Array(cols + 1).join("a"); var text = new Array(rows).join(line + "\n") + line; @@ -9,7 +11,7 @@ exports = { "test: navigate to end of file should scroll the last line into view": function () { var doc = this.createEditSession(200, 10); - var editor = new AceAjax.Editor(new MockRenderer(), doc); + var editor = new AceAjax.Editor(renderer, doc); editor.navigateFileEnd(); var cursor = editor.getCursorPosition(); @@ -20,7 +22,7 @@ exports = { "test: navigate to start of file should scroll the first row into view": function () { var doc = this.createEditSession(200, 10); - var editor = new AceAjax.Editor(new MockRenderer(), doc); + var editor = new AceAjax.Editor(renderer, doc); editor.moveCursorTo(editor.getLastVisibleRow() + 20); editor.navigateFileStart(); @@ -29,7 +31,7 @@ exports = { }, "test: goto hidden line should scroll the line into the middle of the viewport": function () { - var editor = new AceAjax.Editor(new MockRenderer(), this.createEditSession(200, 5)); + var editor = new AceAjax.Editor(renderer, this.createEditSession(200, 5)); editor.navigateTo(0, 0); editor.gotoLine(101); @@ -63,7 +65,7 @@ exports = { }, "test: goto visible line should only move the cursor and not scroll": function () { - var editor = new AceAjax.Editor(new MockRenderer(), this.createEditSession(200, 5)); + var editor = new AceAjax.Editor(renderer, this.createEditSession(200, 5)); editor.navigateTo(0, 0); editor.gotoLine(12); @@ -77,7 +79,7 @@ exports = { }, "test: navigate from the end of a long line down to a short line and back should maintain the curser column": function () { - var editor = new AceAjax.Editor(new MockRenderer(), new AceAjax.EditSession(["123456", "1"])); + var editor = new AceAjax.Editor(renderer, new AceAjax.EditSession(["123456", "1"])); editor.navigateTo(0, 6); assert.position(editor.getCursorPosition(), 0, 6); @@ -90,7 +92,7 @@ exports = { }, "test: reset desired column on navigate left or right": function () { - var editor = new AceAjax.Editor(new MockRenderer(), new AceAjax.EditSession(["123456", "12"])); + var editor = new AceAjax.Editor(renderer, new AceAjax.EditSession(["123456", "12"])); editor.navigateTo(0, 6); assert.position(editor.getCursorPosition(), 0, 6); @@ -106,7 +108,7 @@ exports = { }, "test: typing text should update the desired column": function () { - var editor = new AceAjax.Editor(new MockRenderer(), new AceAjax.EditSession(["1234", "1234567890"])); + var editor = new AceAjax.Editor(renderer, new AceAjax.EditSession(["1234", "1234567890"])); editor.navigateTo(0, 3); editor.insert("juhu"); diff --git a/ace/tests/ace-editor_text_edit-tests.ts b/ace/tests/ace-editor_text_edit-tests.ts index 9d618acc67..6231830163 100644 --- a/ace/tests/ace-editor_text_edit-tests.ts +++ b/ace/tests/ace-editor_text_edit-tests.ts @@ -1,9 +1,12 @@ /// -exports = { +var assert: any; +var renderer: AceAjax.VirtualRenderer; +var mode: any; +var exports = { "test: delete line from the middle": function () { var session = new AceAjax.EditSession(["a", "b", "c", "d"].join("\n")); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 1); editor.removeLines(); @@ -29,7 +32,7 @@ exports = { "test: delete multiple selected lines": function () { var session = new AceAjax.EditSession(["a", "b", "c", "d"].join("\n")); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 1); editor.getSelection().selectDown(); @@ -41,7 +44,7 @@ exports = { "test: delete first line": function () { var session = new AceAjax.EditSession(["a", "b", "c"].join("\n")); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.removeLines(); @@ -51,7 +54,7 @@ exports = { "test: delete last should also delete the new line of the previous line": function () { var session = new AceAjax.EditSession(["a", "b", "c", ""].join("\n")); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(3, 0); @@ -66,7 +69,7 @@ exports = { "test: indent block": function () { var session = new AceAjax.EditSession(["a12345", "b12345", "c12345"].join("\n")); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 3); editor.getSelection().selectDown(); @@ -84,7 +87,7 @@ exports = { "test: indent selected lines": function () { var session = new AceAjax.EditSession(["a12345", "b12345", "c12345"].join("\n")); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 0); editor.getSelection().selectDown(); @@ -94,8 +97,8 @@ exports = { }, "test: no auto indent if cursor is before the {": function () { - var session = new AceAjax.EditSession("{", new JavaScriptMode()); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var session = new AceAjax.EditSession("{",mode); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(0, 0); editor.onTextInput("\n"); @@ -104,7 +107,7 @@ exports = { "test: outdent block": function () { var session = new AceAjax.EditSession([" a12345", " b12345", " c12345"].join("\n")); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(0, 5); editor.getSelection().selectDown(); @@ -129,7 +132,7 @@ exports = { "test: outent without a selection should update cursor": function () { var session = new AceAjax.EditSession(" 12"); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(0, 3); editor.blockOutdent(" "); @@ -139,8 +142,8 @@ exports = { }, "test: comment lines should perserve selection": function () { - var session = new AceAjax.EditSession([" abc", "cde"].join("\n"), new JavaScriptMode()); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var session = new AceAjax.EditSession([" abc", "cde"].join("\n"),mode); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(0, 2); editor.getSelection().selectDown(); @@ -154,8 +157,8 @@ exports = { }, "test: uncomment lines should perserve selection": function () { - var session = new AceAjax.EditSession(["// abc", "//cde"].join("\n"), new JavaScriptMode()); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var session = new AceAjax.EditSession(["// abc", "//cde"].join("\n"),mode); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(0, 1); editor.getSelection().selectDown(); @@ -169,8 +172,8 @@ exports = { }, "test: toggle comment lines twice should return the original text": function () { - var session = new AceAjax.EditSession([" abc", "cde", "fg"], new JavaScriptMode()); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var session = new AceAjax.EditSession([" abc", "cde", "fg"], mode); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(0, 0); editor.getSelection().selectDown(); @@ -185,8 +188,8 @@ exports = { "test: comment lines - if the selection end is at the line start it should stay there": function () { //select down - var session = new AceAjax.EditSession(["abc", "cde"].join("\n"), new JavaScriptMode()); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var session = new AceAjax.EditSession(["abc", "cde"].join("\n"),mode); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(0, 0); editor.getSelection().selectDown(); @@ -195,8 +198,8 @@ exports = { assert.range(editor.getSelectionRange(), 0, 2, 1, 0); // select up - var session = new AceAjax.EditSession(["abc", "cde"].join("\n"), new JavaScriptMode()); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var session = new AceAjax.EditSession(["abc", "cde"].join("\n"),mode); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 0); editor.getSelection().selectUp(); @@ -207,7 +210,7 @@ exports = { "test: move lines down should select moved lines": function () { var session = new AceAjax.EditSession(["11", "22", "33", "44"].join("\n")); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(0, 1); editor.getSelection().selectDown(); @@ -234,7 +237,7 @@ exports = { "test: move lines up should select moved lines": function () { var session = new AceAjax.EditSession(["11", "22", "33", "44"].join("\n")); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(2, 1); editor.getSelection().selectDown(); @@ -254,7 +257,7 @@ exports = { "test: move line without active selection should not move cursor relative to the moved line": function () { var session = new AceAjax.EditSession(["11", "22", "33", "44"].join("\n")); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 1); editor.clearSelection(); @@ -272,7 +275,7 @@ exports = { "test: copy lines down should select lines and place cursor at the selection start": function () { var session = new AceAjax.EditSession(["11", "22", "33", "44"].join("\n")); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 1); editor.getSelection().selectDown(); @@ -287,7 +290,7 @@ exports = { "test: copy lines up should select lines and place cursor at the selection start": function () { var session = new AceAjax.EditSession(["11", "22", "33", "44"].join("\n")); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 1); editor.getSelection().selectDown(); @@ -302,7 +305,7 @@ exports = { "test: input a tab with soft tab should convert it to spaces": function () { var session = new AceAjax.EditSession(""); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); session.setTabSize(2); session.setUseSoftTabs(true); @@ -317,7 +320,7 @@ exports = { "test: input tab without soft tabs should keep the tab character": function () { var session = new AceAjax.EditSession(""); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); session.setUseSoftTabs(false); @@ -331,7 +334,7 @@ exports = { session.setUndoManager(undoManager); var initialText = session.toString(); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.removeLines(); var step1 = session.toString(); @@ -361,7 +364,7 @@ exports = { "test: remove left should remove character left of the cursor": function () { var session = new AceAjax.EditSession(["123", "456"]); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 1); editor.remove("left"); assert.equal(session.toString(), "123\n56"); @@ -370,7 +373,7 @@ exports = { "test: remove left should remove line break if cursor is at line start": function () { var session = new AceAjax.EditSession(["123", "456"]); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 0); editor.remove("left"); assert.equal(session.toString(), "123456"); @@ -381,7 +384,7 @@ exports = { session.setUseSoftTabs(true); session.setTabSize(4); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 8); editor.remove("left"); assert.equal(session.toString(), "123\n 456"); @@ -390,7 +393,7 @@ exports = { "test: transpose at line start should be a noop": function () { var session = new AceAjax.EditSession(["123", "4567", "89"]); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 0); editor.transposeLetters(); @@ -400,7 +403,7 @@ exports = { "test: transpose in line should swap the charaters before and after the cursor": function () { var session = new AceAjax.EditSession(["123", "4567", "89"]); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 2); editor.transposeLetters(); @@ -410,7 +413,7 @@ exports = { "test: transpose at line end should swap the last two characters": function () { var session = new AceAjax.EditSession(["123", "4567", "89"]); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 4); editor.transposeLetters(); @@ -420,7 +423,7 @@ exports = { "test: transpose with non empty selection should be a noop": function () { var session = new AceAjax.EditSession(["123", "4567", "89"]); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 1); editor.getSelection().selectRight(); editor.transposeLetters(); @@ -431,7 +434,7 @@ exports = { "test: transpose should move the cursor behind the last swapped character": function () { var session = new AceAjax.EditSession(["123", "4567", "89"]); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 2); editor.transposeLetters(); assert.position(editor.getCursorPosition(), 1, 3); @@ -440,7 +443,7 @@ exports = { "test: remove to line end": function () { var session = new AceAjax.EditSession(["123", "4567", "89"]); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 2); editor.removeToLineEnd(); assert.equal(session.getValue(), ["123", "45", "89"].join("\n")); @@ -449,7 +452,7 @@ exports = { "test: remove to line end at line end should remove the new line": function () { var session = new AceAjax.EditSession(["123", "4567", "89"]); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 4); editor.removeToLineEnd(); assert.position(editor.getCursorPosition(), 1, 4); @@ -459,7 +462,7 @@ exports = { "test: transform selection to uppercase": function () { var session = new AceAjax.EditSession(["ajax", "dot", "org"]); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 0); editor.getSelection().selectLineEnd(); editor.toUpperCase() @@ -469,7 +472,7 @@ exports = { "test: transform word to uppercase": function () { var session = new AceAjax.EditSession(["ajax", "dot", "org"]); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 0); editor.toUpperCase() assert.equal(session.getValue(), ["ajax", "DOT", "org"].join("\n")); @@ -479,7 +482,7 @@ exports = { "test: transform selection to lowercase": function () { var session = new AceAjax.EditSession(["AJAX", "DOT", "ORG"]); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 0); editor.getSelection().selectLineEnd(); editor.toLowerCase() @@ -489,7 +492,7 @@ exports = { "test: transform word to lowercase": function () { var session = new AceAjax.EditSession(["AJAX", "DOT", "ORG"]); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); editor.moveCursorTo(1, 0); editor.toLowerCase() assert.equal(session.getValue(), ["AJAX", "dot", "ORG"].join("\n")); diff --git a/ace/tests/ace-multi_select-tests.ts b/ace/tests/ace-multi_select-tests.ts index ade1493e23..68c7d1af95 100644 --- a/ace/tests/ace-multi_select-tests.ts +++ b/ace/tests/ace-multi_select-tests.ts @@ -1,5 +1,8 @@ /// +var assert: any; +var editor: any; +var renderer: any; var exec = function (name?, times?, args?) { do { editor.commands.exec(name, editor, args); @@ -9,7 +12,7 @@ var testRanges = function (str) { assert.equal(editor.selection.getAllRanges() + "", str + ""); } -exports = { +var exports = { name: "ACE multi_select.js", @@ -19,7 +22,7 @@ exports = { " wtt.w", " wtt.w" ]); - editor = new AceAjax.Editor(new MockRenderer(), doc); + editor = new AceAjax.Editor(renderer, doc); editor.navigateFileEnd(); exec("selectMoreBefore", 3); @@ -45,7 +48,7 @@ exports = { " wtt.w", " wtt.we" ]); - editor = new AceAjax.Editor(new MockRenderer(), doc); + editor = new AceAjax.Editor(renderer, doc); editor.selectMoreLines(1); testRanges("Range: [0/0] -> [0/0],Range: [1/0] -> [1/0]"); @@ -67,7 +70,7 @@ exports = { " wtt.w", " wtt.w" ]); - editor = new AceAjax.Editor(new MockRenderer(), doc); + editor = new AceAjax.Editor(renderer, doc); editor.selectMoreLines(1) testRanges("Range: [0/0] -> [0/0],Range: [1/0] -> [1/0]"); @@ -87,7 +90,7 @@ exports = { " wtt.w", " wtt.w" ]); - editor = new AceAjax.Editor(new MockRenderer(), doc); + editor = new AceAjax.Editor(renderer, doc); var selection = editor.selection; diff --git a/ace/tests/ace-placeholder-tests.ts b/ace/tests/ace-placeholder-tests.ts index 124554cf7d..b9693da372 100644 --- a/ace/tests/ace-placeholder-tests.ts +++ b/ace/tests/ace-placeholder-tests.ts @@ -1,10 +1,13 @@ /// -exports = { +var assert: any; +var renderer: AceAjax.VirtualRenderer; +var mode: any; +var exports = { "test: simple at the end appending of text": function () { - var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);", new JavaScriptMode()); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);", mode); + var editor = new AceAjax.Editor(renderer, session); new AceAjax.PlaceHolder(session, 1, { row: 0, column: 4 }, [{ row: 1, column: 12 }, { row: 1, column: 15 }]); @@ -20,8 +23,8 @@ exports = { }, "test: inserting text outside placeholder": function () { - var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);\n", new JavaScriptMode()); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);\n", mode); + var editor = new AceAjax.Editor(renderer, session); new AceAjax.PlaceHolder(session, 1, { row: 0, column: 4 }, [{ row: 1, column: 12 }, { row: 1, column: 15 }]); @@ -31,8 +34,8 @@ exports = { }, "test: insertion at the beginning": function (next) { - var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);", new JavaScriptMode()); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);", mode); + var editor = new AceAjax.Editor(renderer, session); var p = new AceAjax.PlaceHolder(session, 1, { row: 0, column: 4 }, [{ row: 1, column: 12 }, { row: 1, column: 15 }]); @@ -49,8 +52,8 @@ exports = { }, "test: detaching placeholder": function () { - var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);", new JavaScriptMode()); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);", mode); + var editor = new AceAjax.Editor(renderer, session); var p = new AceAjax.PlaceHolder(session, 1, { row: 0, column: 4 }, [{ row: 1, column: 12 }, { row: 1, column: 15 }]); @@ -63,8 +66,8 @@ exports = { }, "test: events": function () { - var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);", new JavaScriptMode()); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);", mode); + var editor = new AceAjax.Editor(renderer, session); var p = new AceAjax.PlaceHolder(session, 1, { row: 0, column: 4 }, [{ row: 1, column: 12 }, { row: 1, column: 15 }]); var entered = false; @@ -86,9 +89,9 @@ exports = { }, "test: cancel": function (next) { - var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);", new JavaScriptMode()); + var session = new AceAjax.EditSession("var a = 10;\nconsole.log(a, a);", mode); session.setUndoManager(new AceAjax.UndoManager()); - var editor = new AceAjax.Editor(new MockRenderer(), session); + var editor = new AceAjax.Editor(renderer, session); var p = new AceAjax.PlaceHolder(session, 1, { row: 0, column: 4 }, [{ row: 1, column: 12 }, { row: 1, column: 15 }]); editor.moveCursorTo(0, 5); diff --git a/ace/tests/ace-range-tests.ts b/ace/tests/ace-range-tests.ts index 8a1b1ccc65..8e560e8d22 100644 --- a/ace/tests/ace-range-tests.ts +++ b/ace/tests/ace-range-tests.ts @@ -1,6 +1,7 @@ /// -exports = { +var assert: any; +var exports = { name: "ACE range.js", diff --git a/ace/tests/ace-range_list-tests.ts b/ace/tests/ace-range_list-tests.ts index 83f3c8a91c..3a531579eb 100644 --- a/ace/tests/ace-range_list-tests.ts +++ b/ace/tests/ace-range_list-tests.ts @@ -1,5 +1,6 @@ /// +var assert: any; function flatten(rangeList) { var points = []; rangeList.ranges.forEach(function (r) { @@ -11,7 +12,7 @@ function testRangeList(rangeList, points) { assert.equal("" + flatten(rangeList), "" + points); } -exports = { +var exports = { name: "ACE range_list.js", diff --git a/ace/tests/ace-search-tests.ts b/ace/tests/ace-search-tests.ts index c30139d656..14b53397bb 100644 --- a/ace/tests/ace-search-tests.ts +++ b/ace/tests/ace-search-tests.ts @@ -1,6 +1,7 @@ /// -exports = { +var assert: any; +var exports = { "test: configure the search object": function () { var search = new AceAjax.Search(); search.set({ diff --git a/ace/tests/ace-selection-tests.ts b/ace/tests/ace-selection-tests.ts index 030cdff66a..884631085e 100644 --- a/ace/tests/ace-selection-tests.ts +++ b/ace/tests/ace-selection-tests.ts @@ -1,6 +1,7 @@ /// -exports = { +var assert: any; +var exports = { createSession: function (rows, cols) { var line = new Array(cols + 1).join("a"); var text = new Array(rows).join(line + "\n") + line; diff --git a/ace/tests/ace-token_iterator-tests.ts b/ace/tests/ace-token_iterator-tests.ts index 75260e95a6..892d781b95 100644 --- a/ace/tests/ace-token_iterator-tests.ts +++ b/ace/tests/ace-token_iterator-tests.ts @@ -1,6 +1,8 @@ /// -exports = { +var assert: any; +var mode: any; +var exports = { "test: token iterator initialization in JavaScript document": function () { var lines = [ "function foo(items) {", @@ -9,7 +11,7 @@ exports = { " } // Real Tab.", "}" ]; - var session = new AceAjax.EditSession(lines.join("\n"), new JavaScriptMode()); + var session = new AceAjax.EditSession(lines.join("\n"),mode); var iterator = new AceAjax.TokenIterator(session, 0, 0); assert.equal(iterator.getCurrentToken().value, "function"); @@ -96,7 +98,7 @@ exports = { " } // Real Tab.", "}" ]; - var session = new AceAjax.EditSession(lines.join("\n"), new JavaScriptMode()); + var session = new AceAjax.EditSession(lines.join("\n"),mode); var tokens = []; var len = session.getLength(); @@ -118,7 +120,7 @@ exports = { " } // Real Tab.", "}" ]; - var session = new AceAjax.EditSession(lines.join("\n"), new JavaScriptMode()); + var session = new AceAjax.EditSession(lines.join("\n"),mode); var tokens = []; var len = session.getLength(); @@ -140,7 +142,7 @@ exports = { " } // Real Tab.", "}" ]; - var session = new AceAjax.EditSession(lines.join("\n"), new JavaScriptMode()); + var session = new AceAjax.EditSession(lines.join("\n"),mode); var iterator = new AceAjax.TokenIterator(session, 0, 0); diff --git a/ace/tests/ace-virtual_renderer-tests.ts b/ace/tests/ace-virtual_renderer-tests.ts index 83372ad342..51f349dad3 100644 --- a/ace/tests/ace-virtual_renderer-tests.ts +++ b/ace/tests/ace-virtual_renderer-tests.ts @@ -1,6 +1,7 @@ /// -exports = { +var assert: any; +var exports = { "test: screen2text the column should be rounded to the next character edge": function () { var el = document.createElement("div");