Merge with upstream nbviewer.js

Author: tuxu

nbviewer.js/README.md

@@ -14,11 +14,6 @@ There are two ways one can use this. You can use the library itself, there is ju
 
 Or you can use [the demo](https://kokes.github.io/nbviewer.js/viewer.html) (or a local copy), which is just a simple wrapper of the library, with dropzones and other basic features. There is no data being transferred anywhere, so feel free to bookmark it and use it.
 
-Two immediate use cases come to mind:
-
-1. ~~In Mac OS, you can preview files and this system, [Quick Look](https://support.apple.com/kb/PH21920?locale=en_US), supports plugins. It would be rather handy to have a notebook preview one keystroke away.~~ This has been done, see [ipynb-quicklook](https://github.com/tuxu/ipynb-quicklook).
-2. Ever since GitHub introduced notebook rendering last year, Gitlab users have been [requesting the same](https://gitlab.com/gitlab-org/gitlab-ce/issues/2508). Gitlab itself recently dropped Python as a dependency, so its reintroduction just for converting notebooks is rather unlikely. A browser-based solution like this could be a good substitute.
-
 ### Tech details
 It's rather simple at this point, all the DOM manipulation is written in vanilla JavaScript, Markdown rendering goes through [marked.js](https://github.com/chjj/marked), syntax highlighting is administered by [Prism.js](http://prismjs.com/). The example implementation leverages a few goodies from modern web design, like File API or drag&drops, so a fairly modern browser is necessary.
 

nbviewer.js/github-browser.html

@@ -116,7 +116,8 @@ var nbv = (function() {
 
         // no need to join on '\n' - newlines are in the code already
         // .source for v4, .input for v3
-        code.textContent = (cell.source || cell.input).join('');
+        var raw_source = (cell.source || cell.input)
+        code.textContent = typeof raw_source === 'string' ? raw_source : raw_source.join('');
 
         pre.appendChild(code);
         el.appendChild(pre);
@@ -183,7 +184,7 @@ var nbv = (function() {
 
                     dm = d.createElement('pre');
                     dm.style.margin = 0;
-                    dm.textContent = dt.data[fmt].join('');
+                    dm.textContent = typeof dt.data[fmt] === 'string' ? dt.data[fmt] : dt.data[fmt].join('');
                     break;
 
                 case 'text/html':
@@ -216,6 +217,16 @@ var nbv = (function() {
                         dm = d.createElement('img');
                         dm.setAttribute('src', 'data:' + fmt + ';base64,' + 
                             ((typeof dt.data[fmt]) == 'string' ? dt.data[fmt] : dt.data[fmt].join('')));
+                        // use width and height attributes supplied in metadata
+                        if (fmt in dt.metadata) {
+                            var metadata = dt.metadata[fmt];
+                            if ('width' in metadata) {
+                                dm.setAttribute('width', metadata.width);
+                            }
+                            if ('height' in metadata) {
+                                dm.setAttribute('height', metadata.height);
+                            }
+                        }
                         break;
                     }
                     console.error('unexpected format: ' + fmt);

nbviewer.js/lib/nbv.js

@@ -50,8 +50,7 @@
 
 <div id='doc'>
     <select id='file-selector'></select>
-    <div id='instructions'>Drag and drop Jupyter notebooks anywhere here<br />
-    <small>(if you wish to render directly from Github, <a href='github-browser.html'>try our new tool</a>)</small></div>
+    <div id='instructions'>Drag and drop Jupyter notebooks anywhere here</div>
 
 </div>