From 2957034286dfe1e51ab045daa436b45427b932a5 Mon Sep 17 00:00:00 2001
From: bgamard <benjamin.gamard@sword-group.com>
Date: Thu, 9 Nov 2017 14:39:25 +0100
Subject: [PATCH] Closes #147: fix IE file upload

---
 .../docs/controller/document/DocumentEdit.js  |  2 +-
 .../controller/settings/SettingsConfig.js     |  2 +-
 .../webapp/src/app/docs/directive/File.js     | 20 -------------------
 docs-web/src/main/webapp/src/index.html       |  1 -
 .../src/partial/docs/document.edit.html       |  4 ++--
 .../partial/docs/document.view.content.html   | 17 ++++++++--------
 .../src/partial/docs/settings.config.html     |  6 +++---
 docs-web/src/main/webapp/src/style/main.less  |  1 +
 8 files changed, 16 insertions(+), 37 deletions(-)
 delete mode 100644 docs-web/src/main/webapp/src/app/docs/directive/File.js

diff --git a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentEdit.js b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentEdit.js
index a7ec2e48..65e19ea5 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentEdit.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/document/DocumentEdit.js
@@ -148,7 +148,7 @@ angular.module('docs').controller('DocumentEdit', function($rootScope, $scope, $
           var file = $scope.newFiles[key];
           var formData = new FormData();
           formData.append('id', data.id);
-          formData.append('file', file);
+          formData.append('file', file, file.name);
 
           // Send the file
           $.ajax({
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsConfig.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsConfig.js
index 2c533851..5e0532d5 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsConfig.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsConfig.js
@@ -39,7 +39,7 @@ angular.module('docs').controller('SettingsConfig', function($scope, $rootScope,
   $scope.sendImage = function(type, image) {
     // Build the payload
     var formData = new FormData();
-    formData.append('image', image);
+    formData.append('image', image[0]);
 
     // Send the file
     var done = function() {
diff --git a/docs-web/src/main/webapp/src/app/docs/directive/File.js b/docs-web/src/main/webapp/src/app/docs/directive/File.js
deleted file mode 100644
index 9e0b0be7..00000000
--- a/docs-web/src/main/webapp/src/app/docs/directive/File.js
+++ /dev/null
@@ -1,20 +0,0 @@
-'use strict';
-
-/**
- * File upload directive.
- */
-angular.module('docs').directive('file', function() {
-  return {
-    restrict: 'E',
-    template: '<input type="file" />',
-    replace: true,
-    require: 'ngModel',
-    link: function(scope, element, attrs, ctrl) {
-      element.bind('change', function() {
-        scope.$apply(function() {
-          attrs.multiple ? ctrl.$setViewValue(element[0].files) : ctrl.$setViewValue(element[0].files[0]);
-        });
-      });
-    }
-  }
-});
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/index.html b/docs-web/src/main/webapp/src/index.html
index 42c0ae2f..82c7d25f 100644
--- a/docs-web/src/main/webapp/src/index.html
+++ b/docs-web/src/main/webapp/src/index.html
@@ -79,7 +79,6 @@
     <script src="app/docs/service/User.js" type="text/javascript"></script>
     <script src="app/docs/filter/Newline.js" type="text/javascript"></script>
     <script src="app/docs/filter/Filesize.js" type="text/javascript"></script>
-    <script src="app/docs/directive/File.js" type="text/javascript"></script>
     <script src="app/docs/directive/SelectTag.js" type="text/javascript"></script>
     <script src="app/docs/directive/SelectRelation.js" type="text/javascript"></script>
     <script src="app/docs/directive/AuditLog.js" type="text/javascript"></script>
diff --git a/docs-web/src/main/webapp/src/partial/docs/document.edit.html b/docs-web/src/main/webapp/src/partial/docs/document.edit.html
index 70ed9d04..a450cdff 100644
--- a/docs-web/src/main/webapp/src/partial/docs/document.edit.html
+++ b/docs-web/src/main/webapp/src/partial/docs/document.edit.html
@@ -70,12 +70,12 @@
       <div class="form-group">
         <label class="col-sm-2 control-label" for="inputFiles">{{ 'document.edit.new_files' | translate }}</label>
         <div class="col-sm-6">
-          <file class="form-control" id="inputFiles" multiple="multiple" ng-model="newFiles" ng-disabled="fileIsUploading"></file>
+          <input type="file" ng-file-select class="form-control" id="inputFiles" multiple="multiple" ng-model="newFiles" ng-disabled="fileIsUploading"></input>
         </div>
         <div class="col-sm-4" ng-if="orphanFiles.length > 0">
           + {{ orphanFiles.length }} file{{ orphanFiles.length > 1 ? 's' : '' }}
           {{ 'document.edit.orphan_files' | translate: '{ count: orphanFiles.length }' }}
-        </div>{{newFiles}}
+        </div>
       </div>
       <div class="form-group">
         <label class="col-sm-2 control-label" for="inputTags">{{ 'document.tags' | translate }}</label>
diff --git a/docs-web/src/main/webapp/src/partial/docs/document.view.content.html b/docs-web/src/main/webapp/src/partial/docs/document.view.content.html
index c7afc320..5821da00 100644
--- a/docs-web/src/main/webapp/src/partial/docs/document.view.content.html
+++ b/docs-web/src/main/webapp/src/partial/docs/document.view.content.html
@@ -72,16 +72,15 @@
       <span class="glyphicon glyphicon-move"></span>
       {{ 'document.view.content.drop_zone' | translate }}
     </p>
+  </div>
 
-    <div class="clearfix"></div>
-    <div class="text-center">
-      <button class="btn btn-primary" ng-file-select
-              ng-file-change="fileDropped($files, $event)"
-              input-file-multiple="multiple"
-              ng-multiple="true">
-        {{ 'document.view.content.add_files' | translate }}
-      </button>
-    </div>
+  <div class="text-center">
+    <button class="btn btn-primary" ng-file-select
+      ng-file-change="fileDropped($files, $event)"
+      input-file-multiple="multiple"
+      ng-multiple="true">
+      {{ 'document.view.content.add_files' | translate }}
+    </button>
   </div>
 </div>
 
diff --git a/docs-web/src/main/webapp/src/partial/docs/settings.config.html b/docs-web/src/main/webapp/src/partial/docs/settings.config.html
index 60f6ce24..fac842b1 100644
--- a/docs-web/src/main/webapp/src/partial/docs/settings.config.html
+++ b/docs-web/src/main/webapp/src/partial/docs/settings.config.html
@@ -40,7 +40,7 @@
   <div class="form-group">
     <label class="col-sm-2 control-label" for="inputLogo">{{ 'settings.config.logo' | translate }}</label>
     <div class="col-sm-2">
-      <file accept="image/gif,image/png,image/jpg,image/jpeg"
+      <input type="file" ng-file-select accept="image/gif,image/png,image/jpg,image/jpeg"
         class="form-control" id="inputLogo" ng-model="logo" ng-disabled="sendingImage" />
     </div>
     <div class="col-sm-2">
@@ -54,8 +54,8 @@
   <div class="form-group">
     <label class="col-sm-2 control-label" for="inputBackground">{{ 'settings.config.background_image' | translate }}</label>
     <div class="col-sm-2">
-      <file accept="image/gif,image/png,image/jpg,image/jpeg"
-            class="form-control" id="inputLogo" ng-model="background" ng-disabled="sendingImage" />
+      <input type="file" ng-file-select accept="image/gif,image/png,image/jpg,image/jpeg"
+            class="form-control" id="inputBackground" ng-model="background" ng-disabled="sendingImage" />
     </div>
     <div class="col-sm-2">
       <button class="btn btn-default" ng-click="sendImage('background', background)" ng-disabled="sendingImage || !background">
diff --git a/docs-web/src/main/webapp/src/style/main.less b/docs-web/src/main/webapp/src/style/main.less
index 97a915f1..8aa526e7 100644
--- a/docs-web/src/main/webapp/src/style/main.less
+++ b/docs-web/src/main/webapp/src/style/main.less
@@ -268,6 +268,7 @@ input[readonly].share-link {
 // Vertical alignment
 .vertical-center {
   min-height: 100vh;
+  height: 100vh; /* IE fix */
 
   /* Make it a flex container */
   display: -webkit-box;