Skip to content

Commit

Permalink
🐛 fix Cannot read property indexOf of undefined by angular-jaggy
Browse files Browse the repository at this point in the history
  • Loading branch information
59naga committed Apr 9, 2015
1 parent 0265a98 commit 8ea1129
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 22 deletions.
10 changes: 8 additions & 2 deletions CHANGELOG.md
@@ -1,9 +1,15 @@
v0.1.12 / Apr 9 2015
=========================
* [`unknown`][7] :bug: fix `Cannot read property 'indexOf' of undefined` by angular-jaggy

[7]: https://github.com/59naga/jaggy/commit/

v0.1.11 / Apr 8 2015
=========================
* [`unknown`][6] :bug: Hotfix [#3][6A]
* [`0265a98`][6] :bug: Hotfix [#3][6A]

[6A]: https://github.com/59naga/jaggy/issues/3
[6]: https://github.com/59naga/jaggy/commit/
[6]: https://github.com/59naga/jaggy/commit/0265a98fd8f6d5270b7eaef60c559511335aeb38

v0.1.9 / Apr 7 2015
=========================
Expand Down
2 changes: 1 addition & 1 deletion bower.json
@@ -1,7 +1,7 @@
{
"name": "jaggy",
"main": "public/jaggy.browser.js",
"version": "0.1.10",
"version": "0.1.12",
"homepage": "https://github.com/59naga/jaggy",
"authors": [
"59naga <i59naga@icloud.com>"
Expand Down
4 changes: 3 additions & 1 deletion lib/classes.coffee
Expand Up @@ -88,7 +88,9 @@ class Frames
createDisplay=(frame_id)->
display= document.createElementNS 'http://www.w3.org/2000/svg','use'
display.setAttributeNS 'http://www.w3.org/1999/xlink','href','#'+frame_id if frame_id
document.querySelector('#'+id).insertBefore display,document.querySelector '#'+id+'>g'

anime= document.querySelector '#'+id
anime.insertBefore display,document.querySelector '#'+id+'>g' if anime?

uuid= ->
# via http://stackoverflow.com/questions/105034/create-guid-uuid-in-javascript
Expand Down
3 changes: 3 additions & 0 deletions lib/jaggy.coffee
Expand Up @@ -135,6 +135,9 @@ Jaggy.angularModule= (window)->
# fix <img ng-src="url" jaggy>
url= attrs.src
url?= attrs.ngSrc
if not url? or url.length is 0
element.replaceWith jaggyEmptyImage if jaggyConfig.useEmptyImage
return

Jaggy.createSVG url,options,(error,svg)->
if error
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8">
<title>Document</title>
<script src="pkgs.js"></script>
<script src="jaggy.browser.min.js"></script>
<script src="jaggy.browser.js"></script>
<script title="for browser">
jaggy('moon.png',function(error,svg){
document.querySelector('section').appendChild(svg);
Expand Down
12 changes: 11 additions & 1 deletion public/jaggy.browser.js
Expand Up @@ -129,11 +129,15 @@ Frames = (function() {
return setTimeout(nextFrame, frame.getAttribute('delay'));
};
return createDisplay = function(frame_id) {
var anime;
display = document.createElementNS('http://www.w3.org/2000/svg', 'use');
if (frame_id) {
display.setAttributeNS('http://www.w3.org/1999/xlink', 'href', '#' + frame_id);
}
return document.querySelector('#' + id).insertBefore(display, document.querySelector('#' + id + '>g'));
anime = document.querySelector('#' + id);
if (anime != null) {
return anime.insertBefore(display, document.querySelector('#' + id + '>g'));
}
};
};

Expand Down Expand Up @@ -516,6 +520,12 @@ Jaggy.angularModule = function(window) {
if (url == null) {
url = attrs.ngSrc;
}
if ((url == null) || url.length === 0) {
if (jaggyConfig.useEmptyImage) {
element.replaceWith(jaggyEmptyImage);
}
return;
}
return Jaggy.createSVG(url, options, function(error, svg) {
var ref2, script, svgContainer;
if (error) {
Expand Down
28 changes: 13 additions & 15 deletions public/jaggy.browser.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/jaggy.browser.min.js.map

Large diffs are not rendered by default.

0 comments on commit 8ea1129

Please sign in to comment.