Skip to content

DOM manipulation is now wrapped inside $timeout #86

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
fabioaarito wants to merge 2 commits into
base: master
Choose a base branch
from
Open

DOM manipulation is now wrapped inside $timeout #86

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
252c40d
DOM manipulation is now wrapped inside $timeout
fabioaarito Oct 5, 2017
c7ed91e
fix 252c40d09857ca5de42bd98fb87774c1f59ed5a7
fabioaarito Oct 5, 2017
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
89 changes: 45 additions & 44 deletions src/angular-ellipsis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,60 +116,61 @@ angular.module('dibari.angular-ellipsis', [])
if (_isDefined(attributes.ellipsisFallbackFontSize) && isOverflowed(element)) {
element.css('font-size',attributes.ellipsisFallbackFontSize);
}

// If text has overflow
if (isOverflowed(element, scope.useParent)) {
var bindArrayStartingLength = bindArray.length,
initialMaxHeight = scope.useParent ? getParentHeight(element) : element[0].clientHeight;

if (isHtml) {
element.html(binding + appendString);
} else {
element.text(binding).html(element.html() + appendString);
}
//Set data-overflow on element for targeting
element.attr('data-overflowed', 'true');

// Set complete text and remove one word at a time, until there is no overflow
for (; i < bindArrayStartingLength; i++) {
var current = bindArray.pop();

//if the last string still overflowed, then truncate the last string
if (bindArray.length === 0) {
bindArray[0] = current.substring(0, Math.min(current.length, 5));
}
$timeout(function() {
// If text has overflow
if (isOverflowed(element, scope.useParent)) {
var bindArrayStartingLength = bindArray.length,
initialMaxHeight = scope.useParent ? getParentHeight(element) : element[0].clientHeight;

if (isHtml) {
element.html(bindArray.join(ellipsisSeparator) + appendString);
element.html(binding + appendString);
} else {
element.text(bindArray.join(ellipsisSeparator)).html(element.html() + appendString);
element.text(binding).html(element.html() + appendString);
}

if ((scope.useParent ? element.parent()[0] : element[0]).scrollHeight < initialMaxHeight || isOverflowed(element, scope.useParent) === false) {
attributes.isTruncated = true;
break;
//Set data-overflow on element for targeting
element.attr('data-overflowed', 'true');

// Set complete text and remove one word at a time, until there is no overflow
for (; i < bindArrayStartingLength; i++) {
var current = bindArray.pop();

//if the last string still overflowed, then truncate the last string
if (bindArray.length === 0) {
bindArray[0] = current.substring(0, Math.min(current.length, 5));
}

if (isHtml) {
element.html(bindArray.join(ellipsisSeparator) + appendString);
} else {
element.text(bindArray.join(ellipsisSeparator)).html(element.html() + appendString);
}

if ((scope.useParent ? element.parent()[0] : element[0]).scrollHeight < initialMaxHeight || isOverflowed(element, scope.useParent) === false) {
attributes.isTruncated = true;
break;
}
}
}

// If append string was passed and append click function included
if (ellipsisSymbol != appendString && typeof(scope.ellipsisAppendClick) !== 'undefined' && scope.ellipsisAppendClick !== '') {
element.find('span.angular-ellipsis-append').bind("click", function(e) {
scope.$apply(function() {
scope.ellipsisAppendClick.call(scope, {
event: e
// If append string was passed and append click function included
if (ellipsisSymbol != appendString && typeof(scope.ellipsisAppendClick) !== 'undefined' && scope.ellipsisAppendClick !== '') {
element.find('span.angular-ellipsis-append').bind("click", function(e) {
scope.$apply(function() {
scope.ellipsisAppendClick.call(scope, {
event: e
});
});
});
});
}
}

if(!isTrustedHTML && $sce.isEnabled())
{
$sce.trustAsHtml(binding);
if(!isTrustedHTML && $sce.isEnabled())
{
$sce.trustAsHtml(binding);
}
}
}
else{
element.attr('data-overflowed', 'false');
}
else{
element.attr('data-overflowed', 'false');
}
});
}
}

Expand Down