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

Remove sidebar progress bars #1693

Merged
merged 2 commits into from
Aug 16, 2017
Merged

Remove sidebar progress bars #1693

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a26349
Remove sidebar progress bars
tomgreenfield Aug 4, 2017
f1cb47e
Merge branch 'develop' into issue/1328
taylortom Aug 11, 2017
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
2 changes: 0 additions & 2 deletions frontend/src/modules/editor/global/templates/partials/part_editorCommon.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
<div class="sidebar-item-inner">
<button class="editor-common-sidebar-preview action-primary">
<div class="editor-common-sidebar-preview-progress sidebar-progress"></div>
<span class="editor-common-sidebar-preview-inner">{{ t 'app.preview'}}</span>
<span class="editor-common-sidebar-previewing display-none">
<i class="fa fa-circle-o-notch fa-spin"></i>{{ t 'app.previewing'}}
</span>
</button>

<button class="editor-common-sidebar-download action-secondary">
<div class="editor-common-sidebar-downloading-progress sidebar-progress"></div>
<span class="editor-common-sidebar-download-inner">{{ t 'app.download'}}</span>
<span class="editor-common-sidebar-downloading display-none">
<i class="fa fa-circle-o-notch fa-spin"></i>{{ t 'app.downloading'}}
Expand Down
9 changes: 0 additions & 9 deletions frontend/src/modules/editor/global/views/editorView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,6 @@ define(function(require){
$('.editor-common-sidebar-download-inner').addClass('display-none');
$('.editor-common-sidebar-downloading').removeClass('display-none');

if (Origin.constants.outputPlugin == 'adapt') {
// Report progress for 45 seconds
$('.editor-common-sidebar-downloading').animate({ width: '100%' }, 45000);
}

var courseId = Origin.editor.data.course.get('_id');
var tenantId = Origin.sessionModel.get('tenantId');

Expand Down Expand Up @@ -228,7 +223,6 @@ define(function(require){
var pollUrl = function() {
$.get(url, function(jqXHR, textStatus, errorThrown) {
if (jqXHR.progress < "100") {
$('.navigation-loading-progress').animate({ width: jqXHR.progress + '%' }, 1000);
return;
}
clearInterval(pollId);
Expand All @@ -250,7 +244,6 @@ define(function(require){
var pollId = setInterval(_.bind(function pollURL() {
$.get(url, function(jqXHR, textStatus, errorThrown) {
if (jqXHR.progress < "100") {
$('.editor-common-sidebar-downloading-progress').animate({ width: jqXHR.progress + '%' }, 1000);
return;
}
clearInterval(pollId);
Expand All @@ -264,15 +257,13 @@ define(function(require){
},

resetPreviewProgress: function() {
$('.navigation-loading-progress').css('width', 0).stop();
$('.editor-common-sidebar-preview-inner').removeClass('display-none');
$('.editor-common-sidebar-previewing').addClass('display-none');
$('.navigation-loading-indicator').addClass('display-none');
Origin.editor.isPreviewPending = false;
},

resetDownloadProgress: function() {
$('.editor-common-sidebar-downloading-progress').css('width', 0).stop();
$('.editor-common-sidebar-download-inner').removeClass('display-none');
$('.editor-common-sidebar-downloading').addClass('display-none');
Origin.editor.isDownloadPending = false;
Expand Down
11 changes: 0 additions & 11 deletions frontend/src/modules/sidebar/less/sidebar.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,17 +111,6 @@
}
}

.sidebar-progress {
z-index: 1;
width: 0px;
height:100%;
position: absolute;
background: darken(@secondary-color, 10%);
left: 0px;
top: 0px;
opacity: 0.3;
}

.sidebar-item {
position:relative;
left:10%;
Expand Down