Skip to content

Commit

Permalink
v.1.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
LukaszWatroba committed Mar 29, 2015
1 parent 1b654f6 commit 53d332e
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 16 deletions.
2 changes: 1 addition & 1 deletion dist/v-modal.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* vModal - Simple, flexible and beautiful modal dialogs in AngularJS
* @version v1.1.0
* @version v1.1.1
* @link http://lukaszwatroba.github.io/v-modal
* @author Łukasz Wątroba <[email protected]>
* @license MIT License, http://www.opensource.org/licenses/MIT
Expand Down
8 changes: 4 additions & 4 deletions dist/v-modal.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* vModal - Simple, flexible and beautiful modal dialogs in AngularJS
* @version v1.1.0
* @version v1.1.1
* @link http://lukaszwatroba.github.io/v-modal
* @author Łukasz Wątroba <[email protected]>
* @license MIT License, http://www.opensource.org/licenses/MIT
Expand Down Expand Up @@ -148,8 +148,7 @@ function vModalDirective () {
throw new Error('Expected modal to have exacly one of either `template` or `templateUrl`');
}

var template = config.template,
controller = config.controller || null,
var controller = config.controller || null,
controllerAs = config.controllerAs,
container = angular.element(config.container || $document[0].querySelector(modalConfig.containerSelector)),
element = null,
Expand Down Expand Up @@ -179,7 +178,7 @@ function vModalDirective () {
function attach (html, locals) {
element = angular.element(html);
if (element.length === 0) {
throw new Error('The template contains no elements; you need to wrap text nodes')
throw new Error('The template contains no elements; you need to wrap text nodes');
}
scope = $rootScope.$new();
if (controller) {
Expand Down Expand Up @@ -210,6 +209,7 @@ function vModalDirective () {
scope = null;
element.remove();
element = null;
container.removeAttr('v-modal-open');
});
}

Expand Down
2 changes: 1 addition & 1 deletion dist/v-modal.min.css

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

4 changes: 2 additions & 2 deletions dist/v-modal.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 package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "v-modal",
"description": "vModal - Simple, flexible and beautiful modal dialogs in AngularJS",
"version": "1.1.0",
"version": "1.1.1",
"author": "Łukasz Wątroba <[email protected]>",
"license": "MIT",
"keywords": [
Expand Down
6 changes: 3 additions & 3 deletions src/vModal/services/v-modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
throw new Error('Expected modal to have exacly one of either `template` or `templateUrl`');
}

var template = config.template,
controller = config.controller || null,
var controller = config.controller || null,
controllerAs = config.controllerAs,
container = angular.element(config.container || $document[0].querySelector(modalConfig.containerSelector)),
element = null,
Expand Down Expand Up @@ -47,7 +46,7 @@
function attach (html, locals) {
element = angular.element(html);
if (element.length === 0) {
throw new Error('The template contains no elements; you need to wrap text nodes')
throw new Error('The template contains no elements; you need to wrap text nodes');
}
scope = $rootScope.$new();
if (controller) {
Expand Down Expand Up @@ -78,6 +77,7 @@
scope = null;
element.remove();
element = null;
container.removeAttr('v-modal-open');
});
}

Expand Down
4 changes: 2 additions & 2 deletions src/vModal/styles/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ v-modal {
z-index: $v-modal-zindex;
overflow-x: hidden;
overflow-y: auto;
background-color: rgba(0,0,0, 0.5);
background-color: $v-modal-backdrop;
padding: $v-modal-spacing;

v-close {
Expand Down Expand Up @@ -87,4 +87,4 @@ v-close {

[v-modal-open] {
overflow: hidden;
}
}
3 changes: 1 addition & 2 deletions src/vModal/styles/_settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ $v-modal-default-theme: true !default;
$v-modal-spacing: 20px !default;

$v-modal-zindex: 1000 !default;
$v-modal-backdrop: rgba(0,0,0, 0.6) !default;
$v-modal-backdrop: rgba(0,0,0, 0.5) !default;

$v-dialog-background: white !default;
$v-dialog-border-radius: 2px !default;
Expand All @@ -25,4 +25,3 @@ $v-dialog-lg-width: 860px !default;
$v-close-color: #2196F3 !default;
$v-close-hover-color: #F44336 !default;
$v-close-hover-duration: 0.25s !default;

0 comments on commit 53d332e

Please sign in to comment.