Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 99 additions & 0 deletions src/components/whiteframe/demoDirectiveUsage/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<div layout="row" layout-padding layout-wrap layout-fill style="padding-bottom: 32px;" ng-cloak>

<md-whiteframe md-whiteframe="1" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="1"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="2" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="2"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="3" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="3"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="4" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="4"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="5" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="5"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="6" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="6"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="7" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="7"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="8" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="8"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="9" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="9"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="10" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="10"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="11" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="11"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="12" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="12"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="13" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="13"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="14" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="14"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="15" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="15"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="16" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="16"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="17" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="17"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="18" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="18"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="19" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="19"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="20" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="20"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="21" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="21"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="22" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="22"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="23" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="23"</span>
</md-whiteframe>

<md-whiteframe md-whiteframe="24" flex-sm="45" flex-gt-sm="35" flex-gt-md="25" layout layout-align="center center">
<span>md-whiteframe="24"</span>
</md-whiteframe>

</div>
1 change: 1 addition & 0 deletions src/components/whiteframe/demoDirectiveUsage/script.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
angular.module('whiteframeDirectiveUsage', ['ngMaterial']);
52 changes: 52 additions & 0 deletions src/components/whiteframe/demoDirectiveUsage/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
md-whiteframe {
background: #fff;
margin: 30px;
height: 100px;
}

/* For breakpoint `-xs` */
@media screen and (max-width: 599px) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please annotate with breakpoint alias. e.g.

// For breakpoint `-xs`
@media screen and (max-width: 599px) { ... }

md-whiteframe {
margin: 7px;
height: 50px;
background-color: #c8e4fa;
}
md-whiteframe > span {
font-size: 0.4em;
}
}

/* For breakpoint `-sm` */
@media screen and (min-width: 600px ) and (max-width: 959px) {
md-whiteframe {
margin: 20px;
height: 75px;
}
md-whiteframe > span {
font-size: 0.6em;
}
}

/* For breakpoint `-md` */
@media screen and (min-width: 960px ) and (max-width: 1279px) {
md-whiteframe {
margin: 20px;
height: 90px;
background-color: #fcddde;
}
md-whiteframe > span {
font-size: 0.9em;
}
}

/* For breakpoint `-gt-md` */
@media screen and (min-width: 1280px) {
md-whiteframe {
margin: 25px;
height: 100px;
background-color: #F2FCE2;
}
md-whiteframe > span {
font-size: 1.0em;
}
}
50 changes: 49 additions & 1 deletion src/components/whiteframe/whiteframe.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,52 @@
* @ngdoc module
* @name material.components.whiteframe
*/
angular.module('material.components.whiteframe', []);
angular
.module('material.components.whiteframe', ['material.core'])
.directive('mdWhiteframe', MdWhiteframeDirective);

/**
* @private
* @ngdoc directive
* @module material.components.whiteframe
* @name mdWhiteframe
* @restrict A
*
* @description
* The md-whiteframe directive allows you to apply an elevation shadow to an element.
*
* The attribute values needs to be a number between 1 and 24.
*
* ### Notes
* - If there is no value specified it defaults to 4dp.
* - If the value is not valid it defaults to 4dp.

* @usage
* <hljs lang="html">
* <div md-whiteframe="3">
* <span>Elevation of 3dp</span>
* </div>
* </hljs>
*/
function MdWhiteframeDirective($log) {
var MIN_DP = 1;
var MAX_DP = 24;
var DEFAULT_DP = 4;

return {
restrict: 'A',
link: postLink
};

function postLink(scope, element, attr) {
var elevation = parseInt(attr.mdWhiteframe, 10) || DEFAULT_DP;

if (elevation > MAX_DP || elevation < MIN_DP) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about NaN ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will be falsy and use the default dp (4dp)

$log.warn('md-whiteframe attribute value is invalid. It should be a number between ' + MIN_DP + ' and ' + MAX_DP, element[0]);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be improved?

elevation = DEFAULT_DP;
}

element.addClass('md-whiteframe-' + elevation + 'dp');
}
}

53 changes: 53 additions & 0 deletions src/components/whiteframe/whiteframe.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
describe('mdWhiteframe directive', function() {

beforeEach(module('material.components.whiteframe'));

function buildWhiteframe(elevation) {
var element;
inject(function($compile, $rootScope) {
element = $compile('<div md-whiteframe="' + (elevation || '') + '">')($rootScope);
});
return element;
}

it('should default to 4dp if no attribute value is specified', function() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please tests for md-whiteframe="nonsense" or md-whiteframe="-1", etc.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test for a invalid string is already present. Will add a test for -1 as value

var element = buildWhiteframe();

expect(element).toHaveClass('md-whiteframe-4dp');
});

it('should default to 4dp if the attribute value is invalid', inject(function($log) {
spyOn($log, 'warn');
var element = buildWhiteframe('999');

expect($log.warn).toHaveBeenCalled();
expect(element).toHaveClass('md-whiteframe-4dp');
}));

it('should use the default dp and warn if the attribute value is to low', inject(function($log) {
spyOn($log, 'warn');
var element = buildWhiteframe('-1');

expect($log.warn).toHaveBeenCalled();
expect(element).toHaveClass('md-whiteframe-4dp');
}));

it('should apply the correct whiteframe if attribute value is valid', function() {
var element = buildWhiteframe('9');

expect(element).toHaveClass('md-whiteframe-9dp');
});

it('should default to 4dp if the attribute value is a text', function() {
var element = buildWhiteframe('invalid text');

expect(element).toHaveClass('md-whiteframe-4dp');
});

it('should not round a decimal number', function() {
var element = buildWhiteframe('1.8');

expect(element).toHaveClass('md-whiteframe-1dp');
});

});