diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.css
index f91fe3319e5a5ac4237b921c3b77f4d3deaf4446..cab6a68404229d8268f4f6df473fb2bc3d42fa5c 100644
--- a/apps/files/css/detailsView.css
+++ b/apps/files/css/detailsView.css
@@ -16,6 +16,7 @@
#app-sidebar .mainFileInfoView .icon {
display: inline-block;
+ background-size: 16px 16px;
}
#app-sidebar .mainFileInfoView .permalink {
@@ -102,23 +103,16 @@
color: #999;
}
-#app-sidebar .file-details img {
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
- opacity: .5;
-}
-
-#app-sidebar .file-details img:hover,
-#app-sidebar .file-details img:focus{
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
- opacity: 1;
-}
-
#app-sidebar .action-favorite {
- vertical-align: text-bottom;
+ vertical-align: sub;
padding: 10px;
margin: -10px;
}
+#app-sidebar .action-favorite > span{
+ opacity: .7 !important;
+}
+
#app-sidebar .detailList {
float: left;
}
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index d1ceb436720911a5c8dca9c40153a3eae7cb0332..0fbf3f559fedcdb277d1a2bc33447b1dea66b1da 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -158,15 +158,6 @@ OC.FileUpload.prototype = {
this._conflictMode = mode;
},
- /**
- * Returns whether the upload is in progress
- *
- * @return {boolean}
- */
- isPending: function() {
- return this.data.state() === 'pending';
- },
-
deleteUpload: function() {
delete this.data.jqXHR;
},
@@ -560,21 +551,6 @@ OC.Uploader.prototype = _.extend({
showUploadCancelMessage: _.debounce(function() {
OC.Notification.showTemporary(t('files', 'Upload cancelled.'), {timeout: 10});
}, 500),
- /**
- * Checks the currently known uploads.
- * returns true if any hxr has the state 'pending'
- * @returns {boolean}
- */
- isProcessing:function() {
- var count = 0;
-
- jQuery.each(this._uploads, function(i, upload) {
- if (upload.isPending()) {
- count++;
- }
- });
- return count > 0;
- },
/**
* callback for the conflicts dialog
*/
@@ -1134,13 +1110,6 @@ OC.Uploader.prototype = _.extend({
}
}
- // warn user not to leave the page while upload is in progress
- $(window).on('beforeunload', function(e) {
- if (self.isProcessing()) {
- return t('files', 'File upload is in progress. Leaving the page now will cancel the upload.');
- }
- });
-
//add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
if (navigator.userAgent.search(/konqueror/i) === -1) {
this.$uploadEl.attr('multiple', 'multiple');
diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js
index e9259f75ba1b530e5c7559f7ac607ab20af9c53d..1a69528fd17a42cebeac733aa1c2d77e4ebdfe34 100644
--- a/apps/files/js/mainfileinfodetailview.js
+++ b/apps/files/js/mainfileinfodetailview.js
@@ -20,9 +20,8 @@
'</a>' +
'</div>' +
' <div class="file-details ellipsis">' +
- ' <a href="#" ' +
- ' class="action action-favorite favorite">' +
- ' <img class="svg" alt="{{starAltText}}" src="{{starIcon}}" />' +
+ ' <a href="#" class="action action-favorite favorite permanent">' +
+ ' <span class="icon {{starClass}}" title="{{starAltText}}"></span>' +
' </a>' +
' {{#if hasSize}}<span class="size" title="{{altSize}}">{{size}}</span>, {{/if}}<span class="date live-relative-timestamp" data-timestamp="{{timestamp}}" title="{{altDate}}">{{date}}</span>' +
' </div>' +
@@ -155,7 +154,7 @@
timestamp: this.model.get('mtime'),
date: OC.Util.relativeModifiedDate(this.model.get('mtime')),
starAltText: isFavorite ? t('files', 'Favorited') : t('files', 'Favorite'),
- starIcon: OC.imagePath('core', isFavorite ? 'actions/starred' : 'actions/star'),
+ starClass: isFavorite ? 'icon-starred' : 'icon-star',
permalink: this._makePermalink(this.model.get('id')),
permalinkTitle: t('files', 'Copy local link')
}));
diff --git a/apps/files/tests/js/mainfileinfodetailviewSpec.js b/apps/files/tests/js/mainfileinfodetailviewSpec.js
index e81adbcf7ac0555321179234e8c9baf0a93a9a8d..faf0faa8d8f5e08341b73bb478215cf38d0d53ad 100644
--- a/apps/files/tests/js/mainfileinfodetailviewSpec.js
+++ b/apps/files/tests/js/mainfileinfodetailviewSpec.js
@@ -70,13 +70,13 @@ describe('OCA.Files.MainFileInfoDetailView tests', function() {
it('displays favorite icon', function() {
testFileInfo.set('tags', [OC.TAG_FAVORITE]);
view.setFileInfo(testFileInfo);
- expect(view.$el.find('.favorite img').attr('src'))
- .toEqual(OC.imagePath('core', 'actions/starred'));
+ expect(view.$el.find('.action-favorite > span').hasClass('icon-starred')).toEqual(true);
+ expect(view.$el.find('.action-favorite > span').hasClass('icon-star')).toEqual(false);
testFileInfo.set('tags', []);
view.setFileInfo(testFileInfo);
- expect(view.$el.find('.favorite img').attr('src'))
- .toEqual(OC.imagePath('core', 'actions/star'));
+ expect(view.$el.find('.action-favorite > span').hasClass('icon-starred')).toEqual(false);
+ expect(view.$el.find('.action-favorite > span').hasClass('icon-star')).toEqual(true);
});
it('displays mime icon', function() {
// File
@@ -187,13 +187,13 @@ describe('OCA.Files.MainFileInfoDetailView tests', function() {
testFileInfo.set('tags', [OC.TAG_FAVORITE]);
- expect(view.$el.find('.favorite img').attr('src'))
- .toEqual(OC.imagePath('core', 'actions/starred'));
+ expect(view.$el.find('.action-favorite > span').hasClass('icon-starred')).toEqual(true);
+ expect(view.$el.find('.action-favorite > span').hasClass('icon-star')).toEqual(false);
testFileInfo.set('tags', []);
- expect(view.$el.find('.favorite img').attr('src'))
- .toEqual(OC.imagePath('core', 'actions/star'));
+ expect(view.$el.find('.action-favorite > span').hasClass('icon-starred')).toEqual(false);
+ expect(view.$el.find('.action-favorite > span').hasClass('icon-star')).toEqual(true);
});
it('unbinds change listener from model', function() {
view.setFileInfo(testFileInfo);
@@ -207,8 +207,8 @@ describe('OCA.Files.MainFileInfoDetailView tests', function() {
testFileInfo.set('tags', [OC.TAG_FAVORITE]);
// no change
- expect(view.$el.find('.favorite img').attr('src'))
- .toEqual(OC.imagePath('core', 'actions/star'));
+ expect(view.$el.find('.action-favorite > span').hasClass('icon-starred')).toEqual(false);
+ expect(view.$el.find('.action-favorite > span').hasClass('icon-star')).toEqual(true);
});
});
describe('events', function() {