Commit a160ad8c by David Taylor Committed by GitHub

Merge pull request #110 from jeff-phillips-18/tour

Fix for isWindowBelowBreakpoint checks
parents 0474ce96 42be9f64
...@@ -1902,15 +1902,18 @@ angular.module("openshiftCommonUI") ...@@ -1902,15 +1902,18 @@ angular.module("openshiftCommonUI")
isWindowBelowBreakpoint: function(size) { isWindowBelowBreakpoint: function(size) {
switch(size) { switch(size) {
case WINDOW_SIZE_XXS: case WINDOW_SIZE_XXS:
return window.innerWidth < BREAKPOINTS.screenXsMin; return false; // Nothing is below xxs
break; break;
case WINDOW_SIZE_XS: case WINDOW_SIZE_XS:
return window.innerWidth < BREAKPOINTS.screenSmMin; return window.innerWidth < BREAKPOINTS.screenXsMin;
break; break;
case WINDOW_SIZE_SM: case WINDOW_SIZE_SM:
return window.innerWidth < BREAKPOINTS.screenMdMin; return window.innerWidth < BREAKPOINTS.screenSmMin;
break; break;
case WINDOW_SIZE_MD: case WINDOW_SIZE_MD:
return window.innerWidth < BREAKPOINTS.screenMdMin;
break;
case WINDOW_SIZE_LG:
return window.innerWidth < BREAKPOINTS.screenLgMin; return window.innerWidth < BREAKPOINTS.screenLgMin;
break; break;
default: default:
......
...@@ -5027,15 +5027,18 @@ angular.module("openshiftCommonUI") ...@@ -5027,15 +5027,18 @@ angular.module("openshiftCommonUI")
isWindowBelowBreakpoint: function(size) { isWindowBelowBreakpoint: function(size) {
switch(size) { switch(size) {
case WINDOW_SIZE_XXS: case WINDOW_SIZE_XXS:
return window.innerWidth < BREAKPOINTS.screenXsMin; return false; // Nothing is below xxs
break; break;
case WINDOW_SIZE_XS: case WINDOW_SIZE_XS:
return window.innerWidth < BREAKPOINTS.screenSmMin; return window.innerWidth < BREAKPOINTS.screenXsMin;
break; break;
case WINDOW_SIZE_SM: case WINDOW_SIZE_SM:
return window.innerWidth < BREAKPOINTS.screenMdMin; return window.innerWidth < BREAKPOINTS.screenSmMin;
break; break;
case WINDOW_SIZE_MD: case WINDOW_SIZE_MD:
return window.innerWidth < BREAKPOINTS.screenMdMin;
break;
case WINDOW_SIZE_LG:
return window.innerWidth < BREAKPOINTS.screenLgMin; return window.innerWidth < BREAKPOINTS.screenLgMin;
break; break;
default: default:
......
...@@ -2161,15 +2161,18 @@ return window.innerWidth < BREAKPOINTS.screenXsMin ? WINDOW_SIZE_XXS :window.inn ...@@ -2161,15 +2161,18 @@ return window.innerWidth < BREAKPOINTS.screenXsMin ? WINDOW_SIZE_XXS :window.inn
isWindowBelowBreakpoint:function(size) { isWindowBelowBreakpoint:function(size) {
switch (size) { switch (size) {
case WINDOW_SIZE_XXS: case WINDOW_SIZE_XXS:
return window.innerWidth < BREAKPOINTS.screenXsMin; return !1;
case WINDOW_SIZE_XS: case WINDOW_SIZE_XS:
return window.innerWidth < BREAKPOINTS.screenSmMin; return window.innerWidth < BREAKPOINTS.screenXsMin;
case WINDOW_SIZE_SM: case WINDOW_SIZE_SM:
return window.innerWidth < BREAKPOINTS.screenMdMin; return window.innerWidth < BREAKPOINTS.screenSmMin;
case WINDOW_SIZE_MD: case WINDOW_SIZE_MD:
return window.innerWidth < BREAKPOINTS.screenMdMin;
case WINDOW_SIZE_LG:
return window.innerWidth < BREAKPOINTS.screenLgMin; return window.innerWidth < BREAKPOINTS.screenLgMin;
default: default:
......
...@@ -39,15 +39,18 @@ angular.module("openshiftCommonUI") ...@@ -39,15 +39,18 @@ angular.module("openshiftCommonUI")
isWindowBelowBreakpoint: function(size) { isWindowBelowBreakpoint: function(size) {
switch(size) { switch(size) {
case WINDOW_SIZE_XXS: case WINDOW_SIZE_XXS:
return window.innerWidth < BREAKPOINTS.screenXsMin; return false; // Nothing is below xxs
break; break;
case WINDOW_SIZE_XS: case WINDOW_SIZE_XS:
return window.innerWidth < BREAKPOINTS.screenSmMin; return window.innerWidth < BREAKPOINTS.screenXsMin;
break; break;
case WINDOW_SIZE_SM: case WINDOW_SIZE_SM:
return window.innerWidth < BREAKPOINTS.screenMdMin; return window.innerWidth < BREAKPOINTS.screenSmMin;
break; break;
case WINDOW_SIZE_MD: case WINDOW_SIZE_MD:
return window.innerWidth < BREAKPOINTS.screenMdMin;
break;
case WINDOW_SIZE_LG:
return window.innerWidth < BREAKPOINTS.screenLgMin; return window.innerWidth < BREAKPOINTS.screenLgMin;
break; break;
default: default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment