Skip to content

Commit

Permalink
Merge branch 'master' into support-shadowroot-handlers
Browse files Browse the repository at this point in the history
  • Loading branch information
lukasoppermann authored Mar 1, 2019
2 parents 2605cca + 872e0ce commit 804ef8b
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 59 deletions.
125 changes: 70 additions & 55 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@
"url": "http://github.com/lukasoppermann/html5sortable/issues"
},
"devDependencies": {
"@types/jest": "^23.3.1",
"@types/jest": "^24.0.0",
"coveralls": "^3.0.2",
"eslint": "^5.6.1",
"eslint-plugin-typescript": "^0.14.0",
"jest": "^23.5.0",
"rollup": "^0.68.0",
"rollup": "^1.2.0",
"rollup-plugin-strip-code": "^0.2.6",
"rollup-plugin-typescript": "^0.8.1",
"rollup-plugin-uglify": "^6.0.1",
"rollup-watch": "^4.3.1",
"snazzy": "^8.0.0",
"standard": "^12.0.1",
"ts-jest": "^23.1.4",
"ts-jest": "^24.0.0",
"typescript": "^3.1.2",
"typescript-eslint-parser": "^21.0.0"
},
Expand Down
6 changes: 5 additions & 1 deletion src/html5sortable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,11 @@ export default function sortable (sortableElements, options: object|string|undef
let customPlaceholder
if (options.placeholder !== null && options.placeholder !== undefined) {
let tempContainer = document.createElement(sortableElement.tagName)
tempContainer.innerHTML = options.placeholder
if (options.placeholder instanceof HTMLElement) {
tempContainer.appendChild(options.placeholder)
} else {
tempContainer.innerHTML = options.placeholder
}
customPlaceholder = tempContainer.children[0]
}
// add placeholder
Expand Down

0 comments on commit 804ef8b

Please sign in to comment.