move resolve in opts

m-e-conroy · Sep 11, 2015 · 4ab4d25 · 4ab4d25
1 parent d388dfd
commit 4ab4d25
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ Usage
 
 ```dialogs.notify('Something Happened','Something happened at this point in the application that I wish to let you know about');```
 
-```dialogs.create('url/to/a/template','ctrlrToUse',{data: topass,anotherVar: 'value'},{},{paramToResolve : function (){return 'value'}});```
+```dialogs.create('url/to/a/template','ctrlrToUse',{data: topass,anotherVar: 'value'},{resolve :{paramToResolve : function (){return 'value'}}});```
 
 TODO: Add more usage explanations.
 

diff --git a/dist/dialogs.js b/dist/dialogs.js
@@ -441,11 +441,10 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers'])
 				 * @param	data 	object
 				 * @param	opts	object
 				 */
-				create : function(url,ctrlr,data,opts,resolve){
+				create : function(url,ctrlr,data,opts){
 					var copy = (opts && angular.isDefined(opts.copy)) ? opts.copy : _copy;
+					var resolve = (opts.resolve)?opts.resolve:{};
 					opts = _setOpts(opts);
-					if(!resolve)
-						resolve = {};
 					resolve.data = function() {
 						if(copy)
 							return angular.copy(data);

diff --git a/dist/dialogs.min.js b/dist/dialogs.min.js
diff --git a/src/dialogs-services.js b/src/dialogs-services.js
@@ -257,11 +257,10 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers'])
 				 * @param	data 	object
 				 * @param	opts	object
 				 */
-				create : function(url,ctrlr,data,opts,resolve){
+				create : function(url,ctrlr,data,opts){
 					var copy = (opts && angular.isDefined(opts.copy)) ? opts.copy : _copy;
+					var resolve = (opts.resolve)?opts.resolve:{};
 					opts = _setOpts(opts);
-					if(!resolve)
-						resolve = {};
 					resolve.data = function() {
 						if(copy)
 							return angular.copy(data);

diff --git a/src/dialogs.js b/src/dialogs.js
@@ -435,11 +435,10 @@ angular.module('dialogs.services',['ui.bootstrap.modal','dialogs.controllers'])
 				 * @param	data 	object
 				 * @param	opts	object
 				 */
-				create : function(url,ctrlr,data,opts,resolve){
+				create : function(url,ctrlr,data,opts){
 					var copy = (opts && angular.isDefined(opts.copy)) ? opts.copy : _copy;
+					var resolve = (opts.resolve)?opts.resolve:{};
 					opts = _setOpts(opts);
-					if(!resolve)
-						resolve = {};
 					resolve.data = function() {
 						if(copy)
 							return angular.copy(data);