Merge commit '711fd7ab2d26326555d3cb284c407b20b3d0da1c' into HEAD

Author: Jenkins Continuous Integration Server

app/directives/tc-fp-file-input/tc-fp-file-input.directive.js

@@ -45,21 +45,28 @@ import _ from 'lodash'
         // set max size
         scope.maxSize = 500 * 1024 * 1024
 
-        var key, value
-          /*
-           *pass original event
-           */
+        /*
+         *pass original event
+         */
         element.bind('change', function(event) {
           event.preventDefault()
           scope.onSuccess(event.originalEvent || event)
           $rootScope.$apply()
         })
-        element = element.length ? element[0] : element
-        for (key in attrs.$attr) {
-          value = attrs.$attr[key]
-          element.setAttribute(value, attrs[key])
-        }
-        filepickerService.constructWidget(element)
+
+        var input = element.find('input')
+        input = input.length ? input[0] : input
+        input.setAttribute('data-fp-maxSize', scope.maxSize)
+        input.setAttribute('data-fp-services', scope.fpServices)
+        input.setAttribute('data-fp-button-class', 'tc-btn')
+        input.setAttribute('data-fp-drag-class', 'tc-fp-file-drag-drop')
+        input.setAttribute('data-fp-multiple', false)
+        input.setAttribute('data-fp-extensions', scope.extensions)
+        input.setAttribute('data-fp-store-location', 's3')
+        input.setAttribute('data-fp-store-container', scope.fpContainer)
+        input.setAttribute('data-fp-store-path', scope.filePath)
+
+        filepickerService.constructWidget(input)
 
         scope.onSuccess = function(event) {
           var fpFile = event.fpfile

app/directives/tc-fp-file-input/tc-fp-file-input.jade

@@ -7,13 +7,5 @@
     span.tc-label__asterisk.lowercase(ng-if="mandatory") #[span *]mandatory
     input.tc-file-field__input(
       type="filepicker-dragdrop",
-      data-fp-maxSize="{{maxSize}}",
-      data-fp-button-class="tc-btn",
-      data-fp-services="{{fpServices}}",
-      data-fp-multiple="false",
-      data-fp-extensions="{{extensions}}",
-      data-fp-store-location="s3",
-      data-fp-store-container="{{fpContainer}}",
-      data-fp-store-path="{{filePath}}",
       on-success="onFileSeleted(event.fpfile)"
     )

app/index.js

@@ -118,6 +118,7 @@ require('../assets/css/directives/challenge-tile.scss')
 require('../assets/css/directives/challenge-links.directive.scss')
 require('../assets/css/directives/badge-tooltip.scss')
 require('../assets/css/directives/tc-banner.scss')
+require('../assets/css/directives/tc-fp-file-input.directive.scss')
 require('../assets/css/community/statistics.scss')
 require('../assets/css/community/members.scss')
 require('../assets/css/community/community.scss')

assets/css/directives/tc-fp-file-input.directive.scss

@@ -0,0 +1,11 @@
+@import 'topcoder/tc-includes';
+
+tc-fp-file-input {
+  .tc-btn {
+    margin-bottom: 5px;
+  }
+
+  .tc-fp-file-drag-drop {
+    width: calc(100% - 4px);
+  }
+}