(#10) Controller: fix invalid url for URI.js

LaxarJS · May 11, 2015 · 9ba3ddb · 9ba3ddb
1 parent e31183d
commit 9ba3ddb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,8 @@
 ## Last Changes
 
 
+- [#10](https://github.com/LaxarJS/ax-markdown-display-widget/issues/10): fixed invalid url for URI.js
+
 ## v1.6.1
 
 - [#9](https://github.com/LaxarJS/ax-markdown-display-widget/issues/9): fixed log warnings

diff --git a/ax-markdown-display-widget.js b/ax-markdown-display-widget.js
@@ -135,7 +135,11 @@ define( [
             return defaultRenderer.image( href, title, text );
          }
          else {
-            return defaultRenderer.image( uri.unicode().absoluteTo( markdownUrl() ), title, text );
+            var markdownSourceUrl = markdownUrl();
+            if( !markdownSourceUrl ) {
+               return defaultRenderer.image( uri.unicode(), title, text );
+            }
+            return defaultRenderer.image( uri.unicode().absoluteTo( markdownSourceUrl ), title, text );
          }
       }
 
@@ -154,7 +158,11 @@ define( [
                return '<a href="' + anchorHref + '">' + text + '</a>';
             }
             else {
-               return defaultRenderer.link( uri.unicode().absoluteTo( markdownUrl() ), title, text );
+               var markdownSourceUrl = markdownUrl();
+               if( !markdownSourceUrl ) {
+                  return defaultRenderer.link( uri.unicode(), title, text );
+               }
+               return defaultRenderer.link( uri.unicode().absoluteTo( markdownSourceUrl ), title, text );
             }
          }
       }
@@ -189,6 +197,7 @@ define( [
             } );
 
             function scrollToAnchor( id ) {
+               if( !id ) { return; }
                var offset = $( '#' + id ).offset();
                if( offset ) {
                   window.scrollTo( offset.left, offset.top );