-
Notifications
You must be signed in to change notification settings - Fork 228
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
10 changed files
with
48 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| /** | ||
| * angular-dialog-service - A service to handle common dialog types in a web application. Built on top of Angular-Bootstrap's modal | ||
| * @version v5.2.10 | ||
| * @version v5.2.11 | ||
| * @author Michael Conroy, [email protected] | ||
| * @license MIT, http://www.opensource.org/licenses/MIT | ||
| */ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| /** | ||
| * angular-dialog-service - A service to handle common dialog types in a web application. Built on top of Angular-Bootstrap's modal | ||
| * @version v5.2.10 | ||
| * @version v5.2.11 | ||
| * @author Michael Conroy, [email protected] | ||
| * @license MIT, http://www.opensource.org/licenses/MIT | ||
| */ | ||
|
|
@@ -212,9 +212,9 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers']) | |
|
|
||
| /** | ||
| * Use Backdrop | ||
| * | ||
| * | ||
| * Sets the use of the modal backdrop. Either to have one or not and | ||
| * whether or not it responds to mouse clicks ('static' sets the | ||
| * whether or not it responds to mouse clicks ('static' sets the | ||
| * backdrop to true and does not respond to mouse clicks). | ||
| * | ||
| * @param val mixed (true, false, 'static') | ||
|
|
@@ -226,7 +226,7 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers']) | |
|
|
||
| /** | ||
| * Use ESC Close | ||
| * | ||
| * | ||
| * Sets the use of the ESC (escape) key to close modal windows. | ||
| * | ||
| * @param val boolean | ||
|
|
@@ -250,7 +250,7 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers']) | |
|
|
||
| /** | ||
| * Use Copy | ||
| * | ||
| * | ||
| * Determines the use of angular.copy when sending data to the modal controller. | ||
| * | ||
| * @param val boolean | ||
|
|
@@ -275,7 +275,7 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers']) | |
| /** | ||
| * Set Size | ||
| * | ||
| * Sets the modal size to use (sm,lg,md), requires Angular-ui-Bootstrap 0.11.0 and Bootstrap 3.1.0 + | ||
| * Sets the modal size to use (sm,lg,md) | ||
| * | ||
| * @param val string (sm,lg,md) | ||
| */ | ||
|
|
@@ -305,7 +305,7 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers']) | |
|
|
||
|
|
||
| this.$get = ['$uibModal',function ($uibModal){ | ||
|
|
||
| return { | ||
| /** | ||
| * Error Dialog | ||
|
|
@@ -337,7 +337,7 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers']) | |
| } | ||
| }); // end modal.open | ||
| }, // end error | ||
|
|
||
| /** | ||
| * Wait Dialog | ||
| * | ||
|
|
@@ -370,7 +370,7 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers']) | |
| } | ||
| }); // end modal.open | ||
| }, // end wait | ||
|
|
||
| /** | ||
| * Notify Dialog | ||
| * | ||
|
|
@@ -401,7 +401,7 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers']) | |
| } | ||
| }); // end modal.open | ||
| }, // end notify | ||
|
|
||
| /** | ||
| * Confirm Dialog | ||
| * | ||
|
|
@@ -432,7 +432,7 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers']) | |
| } | ||
| }); // end modal.open | ||
| }, // end confirm | ||
|
|
||
| /** | ||
| * Create Custom Dialog | ||
| * | ||
|
|
@@ -441,21 +441,22 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers']) | |
| * @param data object | ||
| * @param opts object | ||
| */ | ||
| create : function(url,ctrlr,data,opts){ | ||
| create : function(url,ctrlr,data,opts,ctrlAs){ | ||
| var copy = (opts && angular.isDefined(opts.copy)) ? opts.copy : _copy; | ||
| opts = _setOpts(opts); | ||
|
|
||
| return $uibModal.open({ | ||
| templateUrl : url, | ||
| controller : ctrlr, | ||
| controllerAs : ctrlAs, | ||
| keyboard : opts.kb, | ||
| backdrop : opts.bd, | ||
| backdropClass: opts.bdc, | ||
| windowClass: opts.wc, | ||
| size: opts.ws, | ||
| animation: opts.anim, | ||
| resolve : { | ||
| data : function() { | ||
| data : function() { | ||
| if(copy) | ||
| return angular.copy(data); | ||
| else | ||
|
|
||
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| /** | ||
| * angular-dialog-service - A service to handle common dialog types in a web application. Built on top of Angular-Bootstrap's modal | ||
| * @version v5.2.10 | ||
| * @version v5.2.11 | ||
| * @author Michael Conroy, [email protected] | ||
| * @license MIT, http://www.opensource.org/licenses/MIT | ||
| */ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| /** | ||
| * angular-dialog-service - A service to handle common dialog types in a web application. Built on top of Angular-Bootstrap's modal | ||
| * @version v5.2.10 | ||
| * @version v5.2.11 | ||
| * @author Michael Conroy, [email protected] | ||
| * @license MIT, http://www.opensource.org/licenses/MIT | ||
| */ | ||
|
|
@@ -212,9 +212,9 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers']) | |
|
|
||
| /** | ||
| * Use Backdrop | ||
| * | ||
| * | ||
| * Sets the use of the modal backdrop. Either to have one or not and | ||
| * whether or not it responds to mouse clicks ('static' sets the | ||
| * whether or not it responds to mouse clicks ('static' sets the | ||
| * backdrop to true and does not respond to mouse clicks). | ||
| * | ||
| * @param val mixed (true, false, 'static') | ||
|
|
@@ -226,7 +226,7 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers']) | |
|
|
||
| /** | ||
| * Use ESC Close | ||
| * | ||
| * | ||
| * Sets the use of the ESC (escape) key to close modal windows. | ||
| * | ||
| * @param val boolean | ||
|
|
@@ -250,7 +250,7 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers']) | |
|
|
||
| /** | ||
| * Use Copy | ||
| * | ||
| * | ||
| * Determines the use of angular.copy when sending data to the modal controller. | ||
| * | ||
| * @param val boolean | ||
|
|
@@ -275,7 +275,7 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers']) | |
| /** | ||
| * Set Size | ||
| * | ||
| * Sets the modal size to use (sm,lg,md), requires Angular-ui-Bootstrap 0.11.0 and Bootstrap 3.1.0 + | ||
| * Sets the modal size to use (sm,lg,md) | ||
| * | ||
| * @param val string (sm,lg,md) | ||
| */ | ||
|
|
@@ -305,7 +305,7 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers']) | |
|
|
||
|
|
||
| this.$get = ['$uibModal',function ($uibModal){ | ||
|
|
||
| return { | ||
| /** | ||
| * Error Dialog | ||
|
|
@@ -337,7 +337,7 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers']) | |
| } | ||
| }); // end modal.open | ||
| }, // end error | ||
|
|
||
| /** | ||
| * Wait Dialog | ||
| * | ||
|
|
@@ -370,7 +370,7 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers']) | |
| } | ||
| }); // end modal.open | ||
| }, // end wait | ||
|
|
||
| /** | ||
| * Notify Dialog | ||
| * | ||
|
|
@@ -401,7 +401,7 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers']) | |
| } | ||
| }); // end modal.open | ||
| }, // end notify | ||
|
|
||
| /** | ||
| * Confirm Dialog | ||
| * | ||
|
|
@@ -432,7 +432,7 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers']) | |
| } | ||
| }); // end modal.open | ||
| }, // end confirm | ||
|
|
||
| /** | ||
| * Create Custom Dialog | ||
| * | ||
|
|
@@ -441,21 +441,22 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers']) | |
| * @param data object | ||
| * @param opts object | ||
| */ | ||
| create : function(url,ctrlr,data,opts){ | ||
| create : function(url,ctrlr,data,opts,ctrlAs){ | ||
| var copy = (opts && angular.isDefined(opts.copy)) ? opts.copy : _copy; | ||
| opts = _setOpts(opts); | ||
|
|
||
| return $uibModal.open({ | ||
| templateUrl : url, | ||
| controller : ctrlr, | ||
| controllerAs : ctrlAs, | ||
| keyboard : opts.kb, | ||
| backdrop : opts.bd, | ||
| backdropClass: opts.bdc, | ||
| windowClass: opts.wc, | ||
| size: opts.ws, | ||
| animation: opts.anim, | ||
| resolve : { | ||
| data : function() { | ||
| data : function() { | ||
| if(copy) | ||
| return angular.copy(data); | ||
| else | ||
|
|
||
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters