diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-06-28 09:02:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-28 09:02:03 +0200 |
| commit | b6397ef73a765be807efe363703f27013fd50d7a (patch) | |
| tree | 31fedc1887b2b3b50e720f1e006f9693cd671cff /core/js | |
| parent | 300f0965ae6528b370662ee39346bf6660aeaa5c (diff) | |
| parent | 6670d3765881a1a7579bd96a523a90c2a52aec4a (diff) | |
| download | nextcloud-server-b6397ef73a765be807efe363703f27013fd50d7a.tar.gz nextcloud-server-b6397ef73a765be807efe363703f27013fd50d7a.zip | |
Merge pull request #236 from nextcloud/master-sync-upstream
[Master] sync upstream
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/js.js | 30 | ||||
| -rw-r--r-- | core/js/sharedialoglinkshareview.js | 2 |
2 files changed, 6 insertions, 26 deletions
diff --git a/core/js/js.js b/core/js/js.js index 1c49d38f950..7f98668dcb2 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -788,7 +788,6 @@ var OC={ $(document).trigger(new $.Event('ajaxError'), xhr); }; - // FIXME: also needs an IE8 way if (xhr.addEventListener) { xhr.addEventListener('load', loadCallback); xhr.addEventListener('error', errorCallback); @@ -1857,30 +1856,10 @@ OC.Util = { * This scales the image to the element's actual size, the URL is * taken from the "background-image" CSS attribute. * + * @deprecated IE8 isn't supported since 9.0 * @param {Object} $el image element */ - scaleFixForIE8: function($el) { - if (!this.isIE8()) { - return; - } - var self = this; - $($el).each(function() { - var url = $(this).css('background-image'); - var r = url.match(/url\(['"]?([^'")]*)['"]?\)/); - if (!r) { - return; - } - url = r[1]; - url = self.replaceSVGIcon(url); - // TODO: escape - url = url.replace(/'/g, '%27'); - $(this).css({ - 'filter': 'progid:DXImageTransform.Microsoft.AlphaImageLoader(src=\'' + url + '\', sizingMethod=\'scale\')', - 'background-image': '' - }); - }); - return $el; - }, + scaleFixForIE8: function($el) {}, /** * Returns whether this is IE @@ -1894,10 +1873,11 @@ OC.Util = { /** * Returns whether this is IE8 * - * @return {bool} true if this is IE8, false otherwise + * @deprecated IE8 isn't supported since 9.0 + * @return {bool} false (IE8 isn't supported anymore) */ isIE8: function() { - return $('html').hasClass('ie8'); + return false; }, /** diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js index 512da81da08..ff83b40e0a0 100644 --- a/core/js/sharedialoglinkshareview.js +++ b/core/js/sharedialoglinkshareview.js @@ -215,7 +215,7 @@ var permissions = OC.PERMISSION_READ; if($checkbox.is(':checked')) { - permissions = OC.PERMISSION_UPDATE | OC.PERMISSION_CREATE | OC.PERMISSION_READ; + permissions = OC.PERMISSION_UPDATE | OC.PERMISSION_CREATE | OC.PERMISSION_READ | OC.PERMISSION_DELETE; } this.model.saveLinkShare({ |