Skip to content

Display html title tag as text instead of dimension #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Display html title tag as text instead of dimension #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/img/docs/demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<div ng-controller="ImageDemoCtrl">
<ul class="thumbnails">
<li class="span3"><a class="thumbnail"><img ph-img="260x196" /></a></li>
<li class="span3"><a class="thumbnail"><img ph-img="260x196"/></a></li>
<li class="span2"><a class="thumbnail"><img ph-img="160x83" /></a></li>
<li class="span1"><a class="thumbnail"><img ph-img="60x83" /></a></li>
<li class="span2"><a class="thumbnail"><img ph-img="160x83" /></a></li>
<li class="span1"><a class="thumbnail"><img ph-img="60x83" /></a></li>
</ul>
<hr />
<div>
<h3>It Can Also Do a CSS Background</h3>
<div ph-img="550x100" style="width: 550px; height: 100px; background-repeat: no-repeat;">
<h3>It Can Also Do a CSS Background and with the 'title' as text</h3>
<div ph-img="550x100" title="Wide Image" style="width: 550px; height: 100px; background-repeat: no-repeat;">
<h4>Oooh...</h4>
</div>
</div>
Expand Down
16 changes: 10 additions & 6 deletions src/img/img.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ angular.module( 'placeholders.img', [] )
.directive( 'phImg', function () {
return {
restrict: 'A',
scope: { dimensions: '@phImg' },
scope: { dimensions: '@phImg', title: '@' },
link: function( scope, element, attr ) {
// A reference to a canvas that we can reuse
var canvas;
Expand Down Expand Up @@ -64,9 +64,9 @@ angular.module( 'placeholders.img', [] )

// Grab the provided dimensions.
scope.size = { w: matches[1], h: matches[2] };

// FIXME: only add these if not already present
element.prop( "title", scope.dimensions );
if(! element.prop('title')){
element.prop( "title", scope.dimensions );
}
element.prop( "alt", scope.dimensions );

// And draw the image, getting the returned data URL.
Expand Down Expand Up @@ -123,7 +123,11 @@ angular.module( 'placeholders.img', [] )
// TODO: support configurable font
// FIXME: ensure text will fit and resize if it doesn't
text_size = getTextSize();
text = scope.dimensions;
if(scope.title){
text = scope.title;
} else {
text = scope.dimensions;
}
context.fillStyle = config.text_color;
context.textAlign = 'center';
context.textBaseline = 'middle';
Expand All @@ -136,7 +140,7 @@ angular.module( 'placeholders.img', [] )
}

// Finally, draw the text in its calculated position.
context.fillText( scope.dimensions, scope.size.w / 2, scope.size.h / 2 );
context.fillText( text, scope.size.w / 2, scope.size.h / 2 );

// Get the data URL and return it.
return canvas.toDataURL("image/png");
Expand Down
2 changes: 1 addition & 1 deletion src/img/test/imgSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ describe( 'phImg', function () {
it( 'should add the title and alt attributes', inject( function () {
var dimensions = scope.w+'x'+scope.h;
expect( element.prop( 'alt' ) ).toBe( dimensions );
expect( element.prop( 'title' ) ).toBe( dimensions );
expect( element.prop( 'title' ) ).toBe( dimensions || scope.title);
}));

it( 'should set the CSS `background-image` property if tag is not an img', inject( function () {
Expand Down