Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix hot reload adding the changed component dist to the assets. #611

Merged
merged 2 commits into from
Feb 15, 2019
Merged

Fix hot reload adding the changed component dist to the assets. #611

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c758c5
:bug: Fix hot reload adding the changed component dist to the assets.
T4rk1n Feb 14, 2019
615134d
Merge branch 'master' into fix-reload-dist
T4rk1n Feb 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 37 additions & 36 deletions dash/dash.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1193,42 +1193,43 @@ def _on_assets_change(self, filename, modified, deleted):
self._hard_reload = True
self._reload_hash = _generate_hash()

asset_path = os.path.relpath(
filename, os.path.commonprefix([self._assets_folder, filename]))\
.replace('\\', '/').lstrip('/')

self._changed_assets.append({
'url': self.get_asset_url(asset_path),
'modified': int(modified),
'is_css': filename.endswith('css')
})

if filename not in self._assets_files and not deleted:
res = self._add_assets_resource(asset_path, filename)
if filename.endswith('js'):
self.scripts.append_script(res)
elif filename.endswith('css'):
self.css.append_css(res)

if deleted:
if filename in self._assets_files:
self._assets_files.remove(filename)

def delete_resource(resources):
to_delete = None
for r in resources:
if r.get('asset_path') == asset_path:
to_delete = r
break
if to_delete:
resources.remove(to_delete)

if filename.endswith('js'):
# pylint: disable=protected-access
delete_resource(self.scripts._resources._resources)
elif filename.endswith('css'):
# pylint: disable=protected-access
delete_resource(self.css._resources._resources)
if self._assets_folder in filename:
asset_path = os.path.relpath(
filename, os.path.commonprefix([self._assets_folder, filename])
).replace('\\', '/').lstrip('/')

self._changed_assets.append({
'url': self.get_asset_url(asset_path),
'modified': int(modified),
'is_css': filename.endswith('css')
})

if filename not in self._assets_files and not deleted:
res = self._add_assets_resource(asset_path, filename)
if filename.endswith('js'):
self.scripts.append_script(res)
elif filename.endswith('css'):
self.css.append_css(res)

if deleted:
if filename in self._assets_files:
self._assets_files.remove(filename)

def delete_resource(resources):
to_delete = None
for r in resources:
if r.get('asset_path') == asset_path:
to_delete = r
break
if to_delete:
resources.remove(to_delete)

if filename.endswith('js'):
# pylint: disable=protected-access
delete_resource(self.scripts._resources._resources)
elif filename.endswith('css'):
# pylint: disable=protected-access
delete_resource(self.css._resources._resources)

self._lock.release()

Expand Down