@@ -43131,7 +43131,9 @@ function clearHash(el) {
4313143131 Object(__WEBPACK_IMPORTED_MODULE_6_js_tooltip__["a" /* default */])(this.$el, 'li.prev,li.section,li.next', function () {
4313243132 return __WEBPACK_IMPORTED_MODULE_0_jquery___default()(this).find('a').attr('data-title');
4313343133 });
43134- this.makeSticky();
43134+ if (!this.$el.hasClass('active-subchapter-nav-disabled')) {
43135+ this.makeSticky();
43136+ }
4313543137 },
4313643138 makeSticky: function makeSticky() {
4313743139 var nav = this.$el;
@@ -106079,7 +106081,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
106079106081/* harmony default export */ __webpack_exports__["a"] = (__WEBPACK_IMPORTED_MODULE_1_js_student_view__["a" /* default */].extend({
106080106082 events: {
106081106083 'click button[name=upload]': 'fileUpload',
106082- 'click button[name=Speichern ]': 'saveLicenses',
106084+ 'click button.button[type=submit ]': 'saveLicenses',
106083106085 'click a.cancel.button': 'cancelLicenses',
106084106086 'click button[name=unzip]': 'unzipFile',
106085106087 'click button[name=dontunzip]': 'dontunzipFile',
@@ -106099,6 +106101,11 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
106099106101 this.$('.cw-folder-title').hide();
106100106102 this.$('.cw-folder').hide();
106101106103 }
106104+ var dummy = this.$('.documents.dummy-table').get(0);
106105+ if (dummy) {
106106+ dummy.config = {};
106107+ dummy.config.sortList = {};
106108+ }
106102106109 },
106103106110 fileUpload: function fileUpload() {
106104106111 var files = 0,
@@ -106146,15 +106153,18 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
106146106153 }
106147106154 }).done(function (json) {
106148106155 view.$('.file_upload_window .uploadbar').css('background-size', '100% 100%');
106149-
106150106156 if (json.redirect) {
106151106157 __WEBPACK_IMPORTED_MODULE_0_jquery___default.a.get(json.redirect, function (data) {
106152106158 view.$el.find('.cw-folder').html(data);
106153106159 });
106154- } else {
106160+ }
106161+ if (json.message) {
106155106162 view.$('.errorbox').show().html(json.message);
106156106163 view.$('.file_upload_window .uploadbar').hide();
106157106164 }
106165+ if (json.added_files) {
106166+ view.reloadFiles();
106167+ }
106158106168 });
106159106169 }
106160106170 },
@@ -106195,6 +106205,17 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
106195106205 });
106196106206 return files;
106197106207 },
106208+ reloadFiles: function reloadFiles() {
106209+ var view = this;
106210+ __WEBPACK_IMPORTED_MODULE_2_js_url__["a" /* default */].callHandler(this.model.id, 'reload', {}).then(function (response) {
106211+ view.model.set('files', response.files);
106212+ view.model.set('homework_files', response.homework_files);
106213+ view.$el.html(Object(__WEBPACK_IMPORTED_MODULE_3_js_templates__["a" /* default */])('FolderBlock', 'student_view', _extends({}, view.model.attributes)));
106214+ view.postRender();
106215+ }).catch(function (error) {
106216+ console.log(error);
106217+ });
106218+ },
106198106219 unzipEvent: function unzipEvent(unzip) {
106199106220 var data = new FormData(),
106200106221 form = this.$('form')[0],
@@ -106233,29 +106254,33 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
106233106254 contentType: false,
106234106255 processData: false
106235106256 }).done(function (data) {
106236- view.updateView(data['html']);
106237- });
106238- },
106239- updateView: function updateView(data) {
106240- var view = this,
106241- files = [];
106242- data.forEach(function (entry) {
106243- var file = {
106244- 'id': entry.match(/id="fileref_(.*)\"/)[1],
106245- 'name': entry.match(/<td data-sort-value=\"(.*)\">/)[1],
106246- 'icon': entry.match(/alt=\"file-(.*?)\"/)[1],
106247- 'url': entry.match(/<a href=\"(.*?)\"/)[1].replace(/&/g, '&').replace('sendfile.php?', 'sendfile.php?force_download=1&'),
106248- 'downloadable': '1'
106249- };
106250- files.push(file);
106251- });
106252- files = this.model.get('files').concat(files);
106253- files.sort(function (a, b) {
106254- return a['name'].localeCompare(b['name']);
106257+ view.reloadFiles();
106258+ //view.updateView(data['html']);
106255106259 });
106256- this.model.set('files', files);
106257- this.$el.html(Object(__WEBPACK_IMPORTED_MODULE_3_js_templates__["a" /* default */])('FolderBlock', 'student_view', _extends({}, this.model.attributes)));
106258106260 },
106261+
106262+
106263+ // updateView(data) {
106264+ // var view = this,
106265+ // files = [];
106266+ // data.forEach(function (entry) {
106267+ // var file = {
106268+ // 'id': entry.match(/id="fileref_(.*)\"/)[1],
106269+ // 'name': entry.match(/<td data-sort-value=\"(.*)\">/)[1],
106270+ // 'icon': entry.match(/alt=\"file-(.*?)\"/)[1],
106271+ // 'url': entry.match(/<a href=\"(.*?)\"/)[1].replace(/&/g,'&').replace('sendfile.php?', 'sendfile.php?force_download=1&'),
106272+ // 'downloadable': '1'
106273+ // };
106274+ // files.push(file);
106275+ // });
106276+ // files = this.model.get('files').concat(files);
106277+ // files.sort(function (a,b) {
106278+ // return a['name'].localeCompare(b['name'])
106279+ // })
106280+ // this.model.set('files', files);
106281+ // this.$el.html(templates('FolderBlock', 'student_view', { ...this.model.attributes }));
106282+ // },
106283+
106259106284 triggerFileSelector: function triggerFileSelector() {
106260106285 this.$('.cw-folder-file-upload').click();
106261106286 },
0 commit comments