fomantic-ui 2.9.0-beta.26 → 2.9.0-beta.260

package/src/definitions/modules/toast.less

@@ -523,6 +523,12 @@
     }
   }
   &.vertical when (@variationToastVertical) {
+    & > .content {
+      flex-grow: 1;
+    }
+    &.attached when (@variationToastAttached){
+      flex-grow: 1;
+    }
     & > .close.icon + .content when (@variationToastClose){
       padding-left: @toastCloseDistanceVertical;
     }
@@ -554,6 +560,29 @@
       border-bottom-right-radius: 0;
     }
   }
+
+  &.ui.ui.ui.image when (@variationToastImage) {
+    padding: 0;
+    & > .content {
+      padding-top: @inputVerticalPadding;
+      padding-bottom: @inputVerticalPadding;
+      padding-right: @inputHorizontalPadding;
+    }
+    & > .actions when (@variationToastActions) {
+      margin: 0;
+    }
+    & > .ui.image {
+      border-top-left-radius: @defaultBorderRadius;
+      border-bottom-left-radius: @defaultBorderRadius;
+      &.mini {
+        min-width: @toastImageMiniImageAdjustment;
+        & + .content {
+          min-height: @toastImageMiniImageAdjustment;
+          padding-left: @toastImageMiniImagePadding;
+        }
+      }
+    }
+  }
 }
 
 
@@ -603,24 +632,25 @@
 /*--------------
      Colors
 -------------- */
+& when not (@variationToastColors = false) {
+  each(@variationToastColors, {
+    @color: @value;
+    @c: @colors[@@color][color];
+    @l: @colors[@@color][light];
 
-each(@colors, {
-  @color: replace(@key, '@', '');
-  @c: @colors[@@color][color];
-  @l: @colors[@@color][light];
-
-  .ui.@{color}.toast {
-    background-color: @c;
-    color: @toastTextColor;
-  }
-  & when (@variationToastInverted) {
-    .ui.inverted.@{color}.toast,
-    .ui.toast-container .toast-box > .inverted.@{color}.attached.progress .bar {
-      background-color: @l;
-      color: @toastInvertedTextColor;
+    .ui.@{color}.toast {
+      background-color: @c;
+      color: @toastTextColor;
     }
-  }
-})
+    & when (@variationToastInverted) {
+      .ui.inverted.@{color}.toast,
+      .ui.toast-container .toast-box > .inverted.@{color}.attached.progress .bar {
+        background-color: @l;
+        color: @toastInvertedTextColor;
+      }
+    }
+  })
+}
 
 & when (@variationToastInverted) {
   .ui.inverted.toast {
@@ -679,3 +709,5 @@ each(@colors, {
     opacity: 0;
   }
 }
+
+.loadUIOverrides();

package/src/definitions/modules/transition.js

@@ -771,6 +771,10 @@ $.fn.transition = function() {
         },
 
         hide: function() {
+          if(settings.onHide.call(element) === false) {
+            module.verbose('Hide callback returned false cancelling hide');
+            return false;
+          }
           module.verbose('Hiding element');
           if( module.is.animating() ) {
             module.reset();
@@ -778,35 +782,32 @@ $.fn.transition = function() {
           element.blur(); // IE will trigger focus change if element is not blurred before hiding
           module.remove.display();
           module.remove.visible();
-          if($.isFunction(settings.onBeforeHide)){
-            settings.onBeforeHide.call(element,function(){
-                module.hideNow();
-            });
-          } else {
-              module.hideNow();
-          }
-
+          settings.onBeforeHide.call(element, module.hideNow);
         },
 
         hideNow: function() {
             module.set.hidden();
             module.force.hidden();
-            settings.onHide.call(element);
+            settings.onHidden.call(element);
             settings.onComplete.call(element);
             // module.repaint();
         },
 
         show: function(display) {
-          module.verbose('Showing element', display);
-          if(module.force.visible()) {
+          if(module.force.visible() && settings.onShow.call(element) !== false) {
+            module.verbose('Showing element', display);
             module.remove.hidden();
-            module.set.visible();
-            settings.onShow.call(element);
-            settings.onComplete.call(element);
-            // module.repaint();
+            settings.onBeforeShow.call(element, module.showNow);
           }
         },
 
+        showNow: function(){
+          module.set.visible();
+          settings.onVisible.call(element);
+          settings.onComplete.call(element);
+          // module.repaint();
+        },
+
         toggle: function() {
           if( module.is.visible() ) {
             module.hide();
@@ -1055,7 +1056,11 @@ $.fn.transition.settings = {
   onStart       : function() {},
   onComplete    : function() {},
   onShow        : function() {},
+  onBeforeShow  : function(callback) {callback.call(this)},
+  onVisible     : function() {},
   onHide        : function() {},
+  onHidden      : function() {},
+  onBeforeHide  : function(callback) {callback.call(this)},
 
   // whether timeout should be used to ensure callback fires in cases animationend does not
   useFailSafe   : true,