Merge pull request #43 from dwmkerr/d/Gulp

Moved to gulp.

.travis.yml

@@ -2,7 +2,6 @@ language: node_js
 node_js:
   - '0.10'
 before_script:
-  - 'npm install -g grunt-cli' 
   - 'npm install -g bower' 
   - 'bower install'
 after_script:

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.7
+
+* Moved from grunt to gulp.
+
+## v0.6
+
 ## v0.5
 
 * Updated the dependencies to use AngularJS 1.3 and upwards.

README.md

@@ -72,7 +72,7 @@ for a bootstrap modal:
 ```js
 app.controller('SampleModalController', function($scope, close) {
 
- $scope.close = function(result) {
+ $scope.dismissModal = function(result) {
  	close(result, 200); // close, but give 200ms for bootstrap to animate
  };
 
@@ -90,18 +90,37 @@ should be closed and that's it. Quick hint - if you are using Bootstrap for your
 then make sure the modal template only contains one root level element, see the [FAQ](#faq)
 for the gritty details of why.
 
+To pass data into the modal controller, use the `inputs` field of the modal options. For example:
+
+```js
+ModalService.showModal({
+  templateUrl: "exampletemplate.html",
+  controller: "ExampleController",
+  inputs: {
+    name: "Fry",
+    year: 3001
+  }
+})
+```
+
+injects the `name` and `year` values into the controller:
+
+```js
+app.controler('ExampleController', function($scope, name, year, close) {
+});
+
 #### ShowModal Options
 
 The `showModal` function takes an object with these fields:
 
 * `controller`: The name of the controller to created.
-* `controllerAs` : The name of the variable on the scope the controller is assigned to - (optional)
+* `controllerAs` : The name of the variable on the scope the controller is assigned to - (optional).
 * `templateUrl`: The URL of the HTML template to use for the modal.
 * `template`: If `templateUrl` is not specified, you can specify `template` as raw
   HTML for the modal.
 * `inputs`: A set of values to pass as inputs to the controller. Each value provided
   is injected into the controller constructor.
-* `appendElement`: The custom angular element to append the modal to instead of default body.
+* `appendElement`: The custom angular element to append the modal to instead of default `body` element.
 
 #### The Modal Object
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-modal-service",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "homepage": "https://github.com/dwmkerr/angular-modal-service",
   "authors": [
     "Dave Kerr (github.com/dwmkerr)"
@@ -24,15 +24,19 @@
     "src",
     ".gitignore",
     "*.json",
-    "server.js",
-    "Gruntfile.js",
+    "gulpfile.js",
     "CHANGELOG.md",
     "*.yml"
   ],
   "dependencies": {
-    "angular": "~1.3.x"
+    "angular": "~1.3.x",
+    "bootstrap": "~3.3.2",
+    "jquery": "~2.1.3"
   },
   "devDependencies": {
     "angular-mocks": "~1.3.x"
+  },
+  "resolutions": {
+    "angular": "~1.3.x"
   }
 }