This repository has been archived by the owner on Sep 5, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(icon): improve error recovery and item caching
Merged additional unit tests and announce error methods Improved caching of Icon items - Only prepareIcon styles 1x - Add xmlns name space attribute to SVG (if not present). Restored simplified icon - demoBasic version Resolved conflicts of different components using different default icon sets. Closes #1477.
- Loading branch information
1 parent
223c3da
commit 603e5d6
Showing
13 changed files
with
388 additions
and
175 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,48 @@ | ||
<div ng-app="gridListDemo" ng-controller="gridListDemoCtrl as vm"> | ||
<div ng-controller="AppCtrl as appCtrl"> | ||
<md-grid-list | ||
md-cols-sm="1" md-cols-md="2" md-cols-gt-md="6" | ||
md-row-height-gt-md="1:1" md-row-height="2:2" | ||
md-gutter="12x" md-gutter-gt-sm="8px" > | ||
|
||
<md-grid-list | ||
md-cols-sm="1" md-cols-md="2" md-cols-gt-md="6" | ||
md-row-height-gt-md="1:1" md-row-height="4:3" | ||
md-gutter="8px" md-gutter-gt-sm="4px" > | ||
<md-grid-tile class="gray" | ||
md-rowspan="3" md-colspan="2"> | ||
<md-grid-tile-footer> | ||
<h3>#1: (3r x 2c)</h3> | ||
</md-grid-tile-footer> | ||
</md-grid-tile> | ||
|
||
<md-grid-tile ng-repeat="tile in vm.tiles" | ||
md-rowspan="{{tile.span.row}}" | ||
md-colspan="{{tile.span.col}}" | ||
ng-class="tile.background" > | ||
<md-icon md-svg-icon="{{tile.icon}}"></md-icon> | ||
<md-grid-tile-footer><h3>{{tile.title}}</h3></md-grid-tile-footer> | ||
</md-grid-tile> | ||
<md-grid-tile class="green"> | ||
<md-grid-tile-footer> | ||
<h3>#2: (1r x 1c)</h3> | ||
</md-grid-tile-footer> | ||
</md-grid-tile> | ||
|
||
</md-grid-list> | ||
<md-grid-tile class="yellow"> | ||
<md-grid-tile-footer> | ||
<h3>#3: (1r x 1c)</h3> | ||
</md-grid-tile-footer> | ||
</md-grid-tile> | ||
|
||
<md-grid-tile class="blue" | ||
md-rowspan="2"> | ||
<md-grid-tile-footer> | ||
<h3>#4: (2r x 1c)</h3> | ||
</md-grid-tile-footer> | ||
</md-grid-tile> | ||
|
||
<md-grid-tile class="red" | ||
md-rowspan="2" md-colspan="2"> | ||
<md-grid-tile-footer> | ||
<h3>#5: (2r x 2c)</h3> | ||
</md-grid-tile-footer> | ||
</md-grid-tile> | ||
|
||
<md-grid-tile class="green" | ||
md-rowspan="2" > | ||
<md-grid-tile-footer> | ||
<h3>#6: (2r x 1c)</h3> | ||
</md-grid-tile-footer> | ||
</md-grid-tile> | ||
|
||
</md-grid-list> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,57 +1,3 @@ | ||
|
||
angular | ||
.module('gridListDemoApp', ['ngMaterial']) | ||
.controller('gridListDemoCtrl', function($scope) { | ||
|
||
this.tiles = buildGridModel({ | ||
icon : "avatar:svg-", | ||
title: "Svg-", | ||
background: "" | ||
}); | ||
|
||
function buildGridModel(tileTmpl){ | ||
var it, results = [ ]; | ||
|
||
for (var j=0; j<11; j++) { | ||
|
||
it = angular.extend({},tileTmpl); | ||
it.icon = it.icon + (j+1); | ||
it.title = it.title + (j+1); | ||
it.span = { row : "1", col : "1" }; | ||
|
||
switch(j+1) { | ||
case 1: | ||
it.background = "red"; | ||
it.span.row = it.span.col = 2; | ||
break; | ||
|
||
case 2: it.background = "green"; break; | ||
case 3: it.background = "darkBlue"; break; | ||
case 4: | ||
it.background = "blue"; | ||
it.span.col = 2; | ||
break; | ||
|
||
case 5: | ||
it.background = "yellow"; | ||
it.span.row = it.span.col = 2; | ||
break; | ||
|
||
case 6: it.background = "pink"; break; | ||
case 7: it.background = "darkBlue"; break; | ||
case 8: it.background = "purple"; break; | ||
case 9: it.background = "deepBlue"; break; | ||
case 10: it.background = "lightPurple"; break; | ||
case 11: it.background = "yellow"; break; | ||
} | ||
|
||
results.push(it); | ||
} | ||
return results; | ||
} | ||
}) | ||
.config( function( $mdIconProvider ){ | ||
$mdIconProvider | ||
.iconSet("avatar", './icons/avatar-icons.svg') | ||
.defaultIconSize(128); | ||
}); | ||
angular.module('gridListDemo1', ['ngMaterial']) | ||
.controller('AppCtrl', function($scope) {}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
md-grid-list { margin: 8px; } | ||
.gray { background: #f5f5f5; } | ||
.green { background: #b9f6ca; } | ||
.yellow { background: #ffff8d; } | ||
.blue { background: #84ffff; } | ||
.purple { background: #b388ff; } | ||
.red { background: #ff8a80; } | ||
|
||
|
||
|
||
md-grid-tile { | ||
transition: all 700ms ease-out 50ms; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
<div ng-app="gridListDemo" ng-controller="gridListDemoCtrl as vm"> | ||
|
||
<md-grid-list | ||
md-cols-sm="1" md-cols-md="2" md-cols-gt-md="6" | ||
md-row-height-gt-md="1:1" md-row-height="4:3" | ||
md-gutter="8px" md-gutter-gt-sm="4px" > | ||
|
||
<md-grid-tile ng-repeat="tile in vm.tiles" | ||
md-rowspan="{{tile.span.row}}" | ||
md-colspan="{{tile.span.col}}" | ||
ng-class="tile.background" > | ||
<md-icon md-svg-icon="{{tile.icon}}"></md-icon> | ||
<md-grid-tile-footer><h3>{{tile.title}}</h3></md-grid-tile-footer> | ||
</md-grid-tile> | ||
|
||
</md-grid-list> | ||
|
||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
|
||
angular | ||
.module('gridListDemoApp', ['ngMaterial']) | ||
.controller('gridListDemoCtrl', function($scope) { | ||
|
||
this.tiles = buildGridModel({ | ||
icon : "avatar:svg-", | ||
title: "Svg-", | ||
background: "" | ||
}); | ||
|
||
function buildGridModel(tileTmpl){ | ||
var it, results = [ ]; | ||
|
||
for (var j=0; j<11; j++) { | ||
|
||
it = angular.extend({},tileTmpl); | ||
it.icon = it.icon + (j+1); | ||
it.title = it.title + (j+1); | ||
it.span = { row : "1", col : "1" }; | ||
|
||
switch(j+1) { | ||
case 1: | ||
it.background = "red"; | ||
it.span.row = it.span.col = 2; | ||
break; | ||
|
||
case 2: it.background = "green"; break; | ||
case 3: it.background = "darkBlue"; break; | ||
case 4: | ||
it.background = "blue"; | ||
it.span.col = 2; | ||
break; | ||
|
||
case 5: | ||
it.background = "yellow"; | ||
it.span.row = it.span.col = 2; | ||
break; | ||
|
||
case 6: it.background = "pink"; break; | ||
case 7: it.background = "darkBlue"; break; | ||
case 8: it.background = "purple"; break; | ||
case 9: it.background = "deepBlue"; break; | ||
case 10: it.background = "lightPurple"; break; | ||
case 11: it.background = "yellow"; break; | ||
} | ||
|
||
results.push(it); | ||
} | ||
return results; | ||
} | ||
}) | ||
.config( function( $mdIconProvider ){ | ||
$mdIconProvider.iconSet("avatar", './icons/avatar-icons.svg', 128); | ||
}); |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.