Compare commits

..

No commits in common. "master" and "v0.0.4" have entirely different histories.

7 changed files with 7 additions and 25 deletions

View file

@ -1,3 +0,0 @@
recursive-include jupyterlab_templates/templates/ *
include README.md
include LICENSE

View file

@ -20,9 +20,6 @@ serverextension: install ## enable serverextension
labextension: install ## enable labextension
jupyter labextension install .
dist: ## dist to pypi
python3 setup.py sdist upload -r pypi
# docs: ## make documentation
# make -C ./docs html
@ -34,4 +31,4 @@ help:
print-%:
@echo '$*=$($*)'
.PHONY: clean install serverextension labextension test tests help docs dist
.PHONY: clean install serverextension labextension test tests help docs

View file

@ -26,7 +26,7 @@ def load_jupyter_server_extension(nb_server_app):
host_pattern = '.*$'
base_url = web_app.settings['base_url']
print('Installing jupyterlab_iframe handler on path %s' % url_path_join(base_url, 'iframes'))
print('Installing jupyterlab_iframe handler on path %s' % '/iframes')
print('Handling iframes: %s' % sites)
web_app.add_handlers(host_pattern, [(url_path_join(base_url, 'iframes'), IFrameHandler, {'welcome': welcome, 'sites': sites})])
web_app.add_handlers(host_pattern, [(url_path_join(base_url, '/iframes'), IFrameHandler, {'welcome': welcome, 'sites': sites})])

View file

@ -1,6 +1,6 @@
{
"name": "jupyterlab_iframe",
"version": "0.1.4",
"version": "0.1.3",
"description": "A JupyterLab extension.",
"author": "Tim Paine",
"main": "lib/index.js",
@ -23,7 +23,6 @@
"dependencies": {
"@jupyterlab/application": "^0.16.0",
"@jupyterlab/apputils": "^0.16.0",
"@jupyterlab/coreutils": "^1.0.2",
"@jupyterlab/docmanager": "^0.16.0",
"@phosphor/disposable": "^1.1.2"
},

View file

@ -1,6 +0,0 @@
[bdist_wheel]
universal=1
[metadata]
description_file = README.md
license_file = LICENSE

View file

@ -9,11 +9,11 @@ with open(path.join(here, 'README.md'), encoding='utf-8') as f:
setup(
name='jupyterlab_iframe',
version='0.0.8',
version='0.0.4',
description='IFrame widgets for JupyterLab',
long_description=long_description,
url='https://github.com/timkpaine/jupyterlab_iframe',
download_url='https://github.com/timkpaine/jupyterlab_iframe/archive/v0.0.8.tar.gz',
download_url='https://github.com/timkpaine/jupyterlab_iframe/archive/v0.0.4.tar.gz',
author='Tim Paine',
author_email='t.paine154@gmail.com',
license='GPL',
@ -29,7 +29,6 @@ setup(
keywords='jupyter jupyterlab',
packages=find_packages(exclude=['tests', ]),
data_files=[('', ["LICENSE", "README.md"])],
zip_safe=False,
# entry_points={

View file

@ -6,10 +6,6 @@ import {
ICommandPalette, showDialog, Dialog
} from '@jupyterlab/apputils';
import {
PageConfig
} from '@jupyterlab/coreutils'
import {
IDocumentManager
} from '@jupyterlab/docmanager';
@ -133,7 +129,7 @@ function activate(app: JupyterLab, docManager: IDocumentManager, palette: IComma
// grab sites from serverextension
var xhr = new XMLHttpRequest();
xhr.open("GET", PageConfig.getBaseUrl() + "iframes", true);
xhr.open("GET", "/iframes", true);
xhr.onload = function (e:any) {
if (xhr.readyState === 4) {
if (xhr.status === 200) {