Skip to content

Fix loading text if naturalEvents is not set #628

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

Merged
localjo merged 6 commits into from
Jan 22, 2018
Merged

Fix loading text if naturalEvents is not set #628

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4ab48c4
Fix loading text if naturalEvents is not set
Dec 5, 2017
fb07155
Moved wv-loading div at the end of the productsHolder section
Dec 5, 2017
2f0952a
added loading text to events div
PacoDu Jan 19, 2018
bc59df9
Removed loading div, added Loading text on naturalEvent init
PacoDu Jan 19, 2018
85f7456
Merge branch 'development' of github.com:nasa-gibs/worldview into fix…
PacoDu Jan 19, 2018
2e32157
changed loading string to single quote
PacoDu Jan 19, 2018
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
3 changes: 2 additions & 1 deletion web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,8 @@
<ul id="productsHolder-tabs"></ul>
<div id="productsHoldertoggleButtonHolder"></div>
<div id="products"></div>
<div id="wv-events">Loading...</div>
<div id="wv-events"></div>
<div id="wv-loading">Loading...</div>

@ZachTRice ZachTRice Dec 5, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps this div should go below #wv-data, since "Loading..." is actually indicating that any part of the sidebar is in a loading state and, it contains less important information than what is in the data tab. Otherwise, this looks good to me.

@PacoDu PacoDu Dec 5, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I agree, I'll push that in a minute

<div id="wv-data"></div>
</section>
<div id="wv-map" class="wv-map"></div>
Expand Down
3 changes: 3 additions & 0 deletions web/js/layers/wv.layers.sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,9 @@ wv.layers.sidebar = wv.layers.sidebar || function (models, config) {

$('.accordionToggler')
.bind('click', self.toggle);

// Hide loading information after rendering
$('#wv-loading').hide();
};

var onTabChange = function (e, ui) {
Expand Down