From 29cb387b6987e8c4dadf1605d827a137a643db94 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 2 Sep 2015 17:48:04 +0200 Subject: [PATCH 1/3] removed ng-dialog from master --- ng-dialog/ng-dialog-tests.ts | 52 ----------------- ng-dialog/ng-dialog.d.ts | 105 ----------------------------------- 2 files changed, 157 deletions(-) delete mode 100644 ng-dialog/ng-dialog-tests.ts delete mode 100644 ng-dialog/ng-dialog.d.ts diff --git a/ng-dialog/ng-dialog-tests.ts b/ng-dialog/ng-dialog-tests.ts deleted file mode 100644 index 52b33212a..000000000 --- a/ng-dialog/ng-dialog-tests.ts +++ /dev/null @@ -1,52 +0,0 @@ -/// -/// - -var app = angular.module('testModule', ['ngDialog']); - -class DialogTestController { - - constructor(ngDialog: angular.dialog.IDialogService) { - - ngDialog.close("login-popup", "bye"); - ngDialog.closeAll("bye"); - - var defaults = ngDialog.getDefaults(); - - var dialogs = ngDialog.getOpenDialogs(); - - ngDialog.isOpen("bye"); - - var loginDialog = ngDialog.open({ - template: "login.html", - className: "default flat-ui", - closeByEscape: false, - name: "login-popup" - }); - - if (loginDialog.id === "login-popup") { - loginDialog.close("closing"); - } - - var deleteConfirm = ngDialog.openConfirm({ - template: "confirm.html" - }); - } -} - -class LoginDialogController { - - constructor($scope: angular.dialog.IDialogScope) { - - $scope.closeThisDialog("bye"); - } -} - -app.controller('TestController', DialogTestController); - -app.config((ngDialogProvider: angular.dialog.IDialogProvider) => { - - ngDialogProvider.setDefaults({ - className: "flat-ui" - }) - -}); \ No newline at end of file diff --git a/ng-dialog/ng-dialog.d.ts b/ng-dialog/ng-dialog.d.ts deleted file mode 100644 index a167aee47..000000000 --- a/ng-dialog/ng-dialog.d.ts +++ /dev/null @@ -1,105 +0,0 @@ -// Type definitions for ngDialog -// Project: https://github.com/likeastore/ngDialog -// Definitions by: Stephen Lautier -// Definitions: https://github.com/borisyankov/DefinitelyTyped - -/// - -declare module angular.dialog { - - interface IDialogService { - getDefaults(): IDialogOptions; - open(options: IDialogOpenOptions): IDialogOpenResult; - openConfirm(options: IDialogOpenOptions): IPromise; - - /** - * Determine whether the specified dialog is open or not. - * @param id Dialog id to check for. - * @returns {boolean} Indicating whether it exists or not. - */ - isOpen(id: string): boolean; - close(id: string, value: any); - closeAll(value: any); - getOpenDialogs(); - } - - interface IDialogOpenResult { - id: string; - close: Function; - closePromise: IPromise; - } - - interface IDialogProvider extends angular.IServiceProvider { - /** - * Default options for the dialogs. - * @param defaultOptions - * @returns {} - */ - setDefaults(defaultOptions: IDialogOptions): void; - } - - /** - * Dialog Scope which extends the $scope. - */ - interface IDialogScope extends angular.IScope { - /** - * This allows you to close dialog straight from handler in a popup element. - * @param value Any value passed to this function will be attached to the object which resolves on the close promise for this dialog. - * For dialogs opened with the openConfirm() method the value is used as the reject reason. - */ - closeThisDialog(value: any): void; - } - - interface IDialogOptions { - /** - * This option allows you to control the dialog's look, you can use built-in themes or create your own styled modals. - * It will be appended with the "ngdialog" class e.g. className is "default-theme flat-ui" it will be class="ngdialog default-theme flat-ui". - */ - className?: string; - /** - * If false it allows to hide overlay div behind the modals, default true. - */ - overlay?: boolean; - - /** - * If false it allows to hide close button on modals, default true. - */ - showClose?: boolean; - - /** - * It allows to close modals by clicking Esc button, default true. - * This will close all open modals if there several of them open at the same time. - */ - closeByEscape?: boolean; - - /** - * It allows to close modals by clicking on overlay background, default true. If @see Hammer.js is loaded, it will listen for tap instead of click. - */ - closeByDocument?: boolean; - - /** - * If true allows to use plain string as template, default false. - */ - plain?: boolean; - - /** - * Give a name for a dialog instance. It is useful for identifying specific dialog if there are multiple dialog boxes opened. - */ - name?: string | number; - - preCloseCallback?: string|Function; - } - - /** - * Options which are provided to open a dialog. - */ - interface IDialogOpenOptions extends IDialogOptions { - template: string; - controller?: string|any; - controllerAs?: string; - /** - * Scope object that will be passed to dialog. If you use controller with separate $scope service this object will be passed to $scope.$parent param. - */ - scope?: ng.IScope; - } -} \ No newline at end of file From 03fa2f66fbbb3e885b386c5a023ba744bd353b2b Mon Sep 17 00:00:00 2001 From: Stephen Lautier Date: Fri, 4 Sep 2015 00:25:04 +0200 Subject: [PATCH 2/3] re-added deleted file --- ng-dialog/ng-dialog-tests.ts | 52 ++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 ng-dialog/ng-dialog-tests.ts diff --git a/ng-dialog/ng-dialog-tests.ts b/ng-dialog/ng-dialog-tests.ts new file mode 100644 index 000000000..52b33212a --- /dev/null +++ b/ng-dialog/ng-dialog-tests.ts @@ -0,0 +1,52 @@ +/// +/// + +var app = angular.module('testModule', ['ngDialog']); + +class DialogTestController { + + constructor(ngDialog: angular.dialog.IDialogService) { + + ngDialog.close("login-popup", "bye"); + ngDialog.closeAll("bye"); + + var defaults = ngDialog.getDefaults(); + + var dialogs = ngDialog.getOpenDialogs(); + + ngDialog.isOpen("bye"); + + var loginDialog = ngDialog.open({ + template: "login.html", + className: "default flat-ui", + closeByEscape: false, + name: "login-popup" + }); + + if (loginDialog.id === "login-popup") { + loginDialog.close("closing"); + } + + var deleteConfirm = ngDialog.openConfirm({ + template: "confirm.html" + }); + } +} + +class LoginDialogController { + + constructor($scope: angular.dialog.IDialogScope) { + + $scope.closeThisDialog("bye"); + } +} + +app.controller('TestController', DialogTestController); + +app.config((ngDialogProvider: angular.dialog.IDialogProvider) => { + + ngDialogProvider.setDefaults({ + className: "flat-ui" + }) + +}); \ No newline at end of file From 5d96b26d811c354717bb5e9208925c3ee34ddb41 Mon Sep 17 00:00:00 2001 From: Stephen Lautier Date: Fri, 4 Sep 2015 00:35:40 +0200 Subject: [PATCH 3/3] gulp-sass added support for import * syntax (it was marked as error) --- gulp-sass/gulp-sass-tests.ts | 2 +- gulp-sass/gulp-sass.d.ts | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gulp-sass/gulp-sass-tests.ts b/gulp-sass/gulp-sass-tests.ts index b566b4cdf..429df6572 100644 --- a/gulp-sass/gulp-sass-tests.ts +++ b/gulp-sass/gulp-sass-tests.ts @@ -1,7 +1,7 @@ /// /// import gulp = require("gulp"); -import sass = require("gulp-sass"); +import * as sass from "gulp-sass"; gulp.task('sass', function () { gulp.src('./scss/*.scss') diff --git a/gulp-sass/gulp-sass.d.ts b/gulp-sass/gulp-sass.d.ts index 8d6d4c055..781df0af7 100644 --- a/gulp-sass/gulp-sass.d.ts +++ b/gulp-sass/gulp-sass.d.ts @@ -43,7 +43,10 @@ declare module "gulp-sass" { sync?: boolean; } - function sass(opts?: Options): NodeJS.ReadWriteStream; + interface Sass { + (opts?: Options): NodeJS.ReadWriteStream; + } - export = sass; + var _tmp: Sass; + export = _tmp; } \ No newline at end of file