Skip to content

Commit

Permalink
Bumped up dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
dwmkerr committed Sep 26, 2015
1 parent 16c39b0 commit ad57c4c
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 20 deletions.
15 changes: 6 additions & 9 deletions dst/angular-modal-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,6 @@
return deferred.promise;
}

// If a 'controllerAs' option has been provided, we change the controller
// name to use 'as' syntax. $controller will automatically handle this.
if(typeof controllerName === "string" && options.controllerAs) {
controllerName = controllerName + " as " + options.controllerAs;
}

// Get the actual html of the template.
getTemplate(options.template, options.templateUrl)
.then(function(template) {
Expand All @@ -84,9 +78,9 @@
// We can now clean up the scope and remove the element from the DOM.
modalScope.$destroy();
modalElement.remove();

// Unless we null out all of these objects we seem to suffer
// from memory leaks, if anyone can explain why then I'd
// from memory leaks, if anyone can explain why then I'd
// be very interested to know.
inputs.close = null;
deferred = null;
Expand All @@ -109,8 +103,11 @@
inputs.$element = modalElement;

// Create the controller, explicitly specifying the scope to use.
var modalController = $controller(controllerName, inputs);
var modalController = $controller(options.controller, inputs);

if(options.controllerAs){
modalScope[options.controllerAs] = modalController ;
}
// Finally, append the modal to the dom.
if (options.appendElement) {
// append to custom append element
Expand Down
2 changes: 1 addition & 1 deletion dst/angular-modal-service.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dst/angular-modal-service.min.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 8 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,20 @@
"express": "^4.12.0",
"gulp": "^3.8.11",
"gulp-jshint": "^1.9.2",
"gulp-open": "^0.3.2",
"jshint-stylish": "^1.0.1",
"karma": "^0.12.31",
"karma-chrome-launcher": "^0.1.3",
"karma-chrome-launcher": "^0.1.3",
"karma-coverage": "^0.2.1",
"gulp-open": "^1.0.0",
"jshint-stylish": "^2.0.0",
"karma": "^0.13.0",
"karma-chrome-launcher": "^0.2.3",
"karma-coverage": "^0.5.1",
"karma-jasmine": "~0.3",
"karma-junit-reporter": "~0.2",
"karma-phantomjs-launcher": "^0.1.4",
"karma-junit-reporter": "~0.3",
"karma-phantomjs-launcher": "^0.2.4",
"tiny-lr": "^0.1.5",
"gulp-uglify": "^1.1.0",
"gulp-rename": "^1.2.0",
"gulp-sourcemaps": "^1.5.0",
"connect-livereload": "^0.5.3",
"opn": "^1.0.1",
"opn": "^3.0.1",
"gulp-header": "^1.2.2"
}
}

0 comments on commit ad57c4c

Please # to comment.