Bug 1374165: Unable to upload the same file the second time after clear in ace editor

Author: jhadvig

app/scripts/directives/oscFileInput.js

@@ -24,7 +24,8 @@ angular.module('openshiftConsole')
         dropZoneName = scope.dropZoneId + "-drag-and-drop-zone",
         dropZoneSelectorName = "#" + dropZoneName,
         highlightDropZone = false,
-        showDropZone = false;
+        showDropZone = false,
+        inputFileField = element.find('input[type=file]')[0];
 
         // Add/Remove dropZone based on if the directive element is disabled
         scope.$watch('disabled', function() {
@@ -68,8 +69,14 @@ angular.module('openshiftConsole')
           });
         }
 
+        scope.cleanInputValues = function() {
+          scope.model = '';
+          scope.fileName = '';
+          inputFileField.value = "";
+        };
+
         element.change(function() {
-          addFile($('input[type=file]', this)[0].files[0]);
+          addFile(inputFileField.files[0]);
         });
 
         // Add listeners for the dropZone element

app/views/directives/osc-file-input.html

@@ -32,4 +32,4 @@
 <div ng-if="model && showValues && supportsFileUpload">
   <pre ng-if="model && showValues && supportsFileUpload" class="clipped scroll">{{model}}</pre>
 </div>
-<a href="" ng-show="model || fileName" ng-click="model = ''; fileName = ''">Clear value</a>
+<a href="" ng-show="model || fileName" class="clear-btn" ng-click="cleanInputValues()">Clear value</a>

dist/scripts/scripts.js

@@ -7067,7 +7067,7 @@ function h() {
 $(k).remove();
 }
 b.helpID = _.uniqueId("help-"), b.supportsFileUpload = window.File && window.FileReader && window.FileList && window.Blob, b.uploadError = !1;
-var i = b.dropZoneId ? $("#" + b.dropZoneId) :c, j = b.dropZoneId + "-drag-and-drop-zone", k = "#" + j, l = !1, m = !1;
+var i = b.dropZoneId ? $("#" + b.dropZoneId) :c, j = b.dropZoneId + "-drag-and-drop-zone", k = "#" + j, l = !1, m = !1, n = c.find("input[type=file]")[0];
 b.$watch("disabled", function() {
 b.disabled ? h() :(e(), d());
 }, !0), (_.isUndefined($._data($(document)[0], "events")) || _.isUndefined($._data($(document)[0], "events").drop)) && ($(document).on("drop.oscFileInput", function() {
@@ -7080,8 +7080,10 @@ return m = !0, $(".drag-and-drop-zone").addClass("show-drag-and-drop-zone"), !1;
 return m = !1, _.delay(function() {
 m || $(".drag-and-drop-zone").removeClass("show-drag-and-drop-zone");
 }, 200), !1;
-})), c.change(function() {
-f($("input[type=file]", this)[0].files[0]);
+})), b.cleanInputValues = function() {
+b.model = "", b.fileName = "", n.value = "";
+}, c.change(function() {
+f(n.files[0]);
 }), b.$on("$destroy", function() {
 $(k).off(), $(document).off("drop.oscFileInput").off("dragenter.oscFileInput").off("dragover.oscFileInput").off("dragleave.oscFileInput");
 });

dist/scripts/templates.js

@@ -5881,7 +5881,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div ng-if=\"model && showValues && supportsFileUpload\">\n" +
     "<pre ng-if=\"model && showValues && supportsFileUpload\" class=\"clipped scroll\">{{model}}</pre>\n" +
     "</div>\n" +
-    "<a href=\"\" ng-show=\"model || fileName\" ng-click=\"model = ''; fileName = ''\">Clear value</a>"
+    "<a href=\"\" ng-show=\"model || fileName\" class=\"clear-btn\" ng-click=\"cleanInputValues()\">Clear value</a>"
   );