Adds asset file upload

lib/assets/core/javascripts/cartodb3/components/form-components/editors/fill/input-color/input-color.js

@@ -96,20 +96,16 @@ module.exports = CoreView.extend({
     return false;
   },
 
-  _activatedFlag: function () {
-    return this._userModel && this._userModel.featureEnabled('icon-styling');
+  _iconStylingEnabled: function () {
+    return this._userModel && this._userModel.featureEnabled('icon-styling') && this._imageEnabled;
   },
 
   _getKind: function () {
-    return this._imageEnabled && this.model.get('kind') && this._activatedFlag() ? this.model.get('kind') : '';
+    return this.model.get('kind') && this._iconStylingEnabled() ? this.model.get('kind') : '';
   },
 
   _getImageURL: function () {
-    return this._imageEnabled && this.model.get('image') && this._activatedFlag() ? this.model.get('image') : '';
-  },
-
-  _iconStylingEnabled: function () {
-    return this._userModel && this._userModel.featureEnabled('icon-styling') && this._imageEnabled;
+    return this.model.get('image') && this._iconStylingEnabled() ? this.model.get('image') : '';
   },
 
   // Converts reference to the old color ramp to the full color list