Skip to content

Commit

Permalink
v1.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@yagopv
yagopv committed Dec 1, 2013
1 parent 4b7fc4f commit be526cc
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 56 deletions.
39 changes: 21 additions & 18 deletions dist/js/Stashy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1621,11 +1621,8 @@ window.Modernizr = (function( window, document, undefined ) {
hide = function() {
self.element.addClass("fadeOut");
setTimeout(function() {
//Check for self because activeDurantion can be enabled
if (self) {
self.element.remove();
self = null;
}
self.element.remove();
self = null;
if (toastC.children().length == 0) {
toastC.remove();
}
Expand All @@ -1636,7 +1633,11 @@ window.Modernizr = (function( window, document, undefined ) {
toastC.append(this.element);

if (self.options.activeDuration > 0) {
setTimeout(hide, self.options.activeDuration);
setTimeout(function() {
if (self) {
hide();
}
}, self.options.activeDuration);
}

this.closeElement.on("click", hide);
Expand All @@ -1653,11 +1654,8 @@ window.Modernizr = (function( window, document, undefined ) {
hide = function() {
self.element.addClass(positionY == "top" ? "fadeOutUp" : "fadeOutDown");
setTimeout(function() {
//Check for self because activeDurantion can be enabled
if (self) {
self.element.remove();
self = null;
}
self.element.remove();
self = null;
if (barC.children().length == 0) {
barC.remove();
}
Expand All @@ -1667,7 +1665,11 @@ window.Modernizr = (function( window, document, undefined ) {
barC.append(this.element);

if (self.options.activeDuration > 0) {
setTimeout(hide, self.options.activeDuration);
setTimeout(function() {
if (self) {
hide();
}
}, self.options.activeDuration);
}

this.closeElement.on("click", hide);
Expand All @@ -1683,19 +1685,20 @@ window.Modernizr = (function( window, document, undefined ) {
hide = function() {
self.element.addClass(positionX == "left" ? "fadeOutLeft" : "fadeOutRight");
setTimeout(function() {
//Check for self because activeDurantion can be enabled
if (self) {
self.element.remove();
self = null;
}
self.element.remove();
self = null;
}, self.options.animDuration == "fast" ? 1000 : 2000);
};
this.element.addClass("panel " + positionX)
this.element.addClass(positionX == "left" ? "fadeInLeft" : "fadeInRight");
$(this.options.target).append(this.element);

if (self.options.activeDuration > 0) {
setTimeout(hide, self.options.activeDuration);
setTimeout(function() {
if (self) {
hide();
}
}, self.options.activeDuration);
}

this.closeElement.on("click", hide);
Expand Down
2 changes: 1 addition & 1 deletion dist/js/Stashy.min.js
View file

Large diffs are not rendered by default.

39 changes: 21 additions & 18 deletions docs/public/Scripts/Stashy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1615,11 +1615,8 @@ window.Modernizr = (function( window, document, undefined ) {
hide = function() {
self.element.addClass("fadeOut");
setTimeout(function() {
//Check for self because activeDurantion can be enabled
if (self) {
self.element.remove();
self = null;
}
self.element.remove();
self = null;
if (toastC.children().length == 0) {
toastC.remove();
}
Expand All @@ -1630,7 +1627,11 @@ window.Modernizr = (function( window, document, undefined ) {
toastC.append(this.element);

if (self.options.activeDuration > 0) {
setTimeout(hide, self.options.activeDuration);
setTimeout(function() {
if (self) {
hide();
}
}, self.options.activeDuration);
}

this.closeElement.on("click", hide);
Expand All @@ -1647,11 +1648,8 @@ window.Modernizr = (function( window, document, undefined ) {
hide = function() {
self.element.addClass(positionY == "top" ? "fadeOutUp" : "fadeOutDown");
setTimeout(function() {
//Check for self because activeDurantion can be enabled
if (self) {
self.element.remove();
self = null;
}
self.element.remove();
self = null;
if (barC.children().length == 0) {
barC.remove();
}
Expand All @@ -1661,7 +1659,11 @@ window.Modernizr = (function( window, document, undefined ) {
barC.append(this.element);

if (self.options.activeDuration > 0) {
setTimeout(hide, self.options.activeDuration);
setTimeout(function() {
if (self) {
hide();
}
}, self.options.activeDuration);
}

this.closeElement.on("click", hide);
Expand All @@ -1677,19 +1679,20 @@ window.Modernizr = (function( window, document, undefined ) {
hide = function() {
self.element.addClass(positionX == "left" ? "fadeOutLeft" : "fadeOutRight");
setTimeout(function() {
//Check for self because activeDurantion can be enabled
if (self) {
self.element.remove();
self = null;
}
self.element.remove();
self = null;
}, self.options.animDuration == "fast" ? 1000 : 2000);
};
this.element.addClass("panel " + positionX)
this.element.addClass(positionX == "left" ? "fadeInLeft" : "fadeInRight");
$(this.options.target).append(this.element);

if (self.options.activeDuration > 0) {
setTimeout(hide, self.options.activeDuration);
setTimeout(function() {
if (self) {
hide();
}
}, self.options.activeDuration);
}

this.closeElement.on("click", hide);
Expand Down
2 changes: 1 addition & 1 deletion docs/public/Scripts/vendor.js
View file

Large diffs are not rendered by default.

Binary file added nuget/Stashy.1.1.3.nupkg
View file
Binary file not shown.
39 changes: 21 additions & 18 deletions src/Stashy.Notify.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,8 @@
hide = function() {
self.element.addClass("fadeOut");
setTimeout(function() {
//Check for self because activeDurantion can be enabled
if (self) {
self.element.remove();
self = null;
}
self.element.remove();
self = null;
if (toastC.children().length == 0) {
toastC.remove();
}
Expand All @@ -105,7 +102,11 @@
toastC.append(this.element);

if (self.options.activeDuration > 0) {
setTimeout(hide, self.options.activeDuration);
setTimeout(function() {
if (self) {
hide();
}
}, self.options.activeDuration);
}

this.closeElement.on("click", hide);
Expand All @@ -122,11 +123,8 @@
hide = function() {
self.element.addClass(positionY == "top" ? "fadeOutUp" : "fadeOutDown");
setTimeout(function() {
//Check for self because activeDurantion can be enabled
if (self) {
self.element.remove();
self = null;
}
self.element.remove();
self = null;
if (barC.children().length == 0) {
barC.remove();
}
Expand All @@ -136,7 +134,11 @@
barC.append(this.element);

if (self.options.activeDuration > 0) {
setTimeout(hide, self.options.activeDuration);
setTimeout(function() {
if (self) {
hide();
}
}, self.options.activeDuration);
}

this.closeElement.on("click", hide);
Expand All @@ -152,19 +154,20 @@
hide = function() {
self.element.addClass(positionX == "left" ? "fadeOutLeft" : "fadeOutRight");
setTimeout(function() {
//Check for self because activeDurantion can be enabled
if (self) {
self.element.remove();
self = null;
}
self.element.remove();
self = null;
}, self.options.animDuration == "fast" ? 1000 : 2000);
};
this.element.addClass("panel " + positionX)
this.element.addClass(positionX == "left" ? "fadeInLeft" : "fadeInRight");
$(this.options.target).append(this.element);

if (self.options.activeDuration > 0) {
setTimeout(hide, self.options.activeDuration);
setTimeout(function() {
if (self) {
hide();
}
}, self.options.activeDuration);
}

this.closeElement.on("click", hide);
Expand Down

0 comments on commit be526cc

Please sign in to comment.