Changed file input for script nonce compliancy

Author: Redjaw

knowage/src/main/webapp/Gruntfile.js

@@ -28,8 +28,7 @@ module.exports = function(grunt) {
 	        		 'js/lib/angular/color-picker/tinycolor-min.js',
 	        		 'js/lib/angular/color-picker/tinygradient.min.js',
 	        		 'js/lib/angular/color-picker/angularjs-color-picker.js',
-	        		 'js/lib/xml2js/xml2json.js',
-	        		 'js/lib/angular/angular-base64/angular-base64.min.js'
+	        		 'js/lib/xml2js/xml2json.js'
 	        	 ],
 	        	 'dist/knowage-modules-bundle.js': [
 	        		 'node_modules/moment/min/moment-with-locales.min.js',

knowage/src/main/webapp/WEB-INF/jsp/commons/angular/angularImport.jsp

@@ -56,7 +56,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	<script type="text/javascript" src="<%=urlBuilder.getResourceLink(request,"/js/src/angular_1.4/tools/commons/document-tree/DocumentTree.js")%>"></script> 
 	<script type="text/javascript" src="<%=urlBuilder.getResourceLink(request,"/js/src/angular_1.4/tools/commons/component-tree/componentTree.js")%>"></script> 
 	<script type="text/javascript" src="<%=urlBuilder.getResourceLink(request,"/js/src/angular_1.4/tools/commons/upload-file/FileUpload.js")%>"></script> 
-	<script type="text/javascript" src="<%=urlBuilder.getResourceLink(request,"/js/src/angular_1.4/tools/commons/upload-file/FileUploadBase64.js")%>"></script> 
 	<script type="text/javascript" src="<%=urlBuilder.getResourceLink(request,"/js/src/angular_1.4/tools/commons/angular-time-picker/angularTimePicker.js")%>"></script> 
 	<script type="text/javascript" src="<%=urlBuilder.getResourceLink(request,"/js/src/angular_1.4/tools/commons/angular-list-detail/angularListDetail.js")%>"></script> 
 	<script type="text/javascript" src="<%=urlBuilder.getResourceLink(request,"/js/src/angular_1.4/tools/commons/angular-list-detail/angular2Col.js")%>"></script> 

knowage/src/main/webapp/js/src/angular_1.4/tools/commons/upload-file/FileUploadBase64.js

@@ -134,6 +134,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		$scope.uploadImg = {};
 		$scope.user = sbiModule_user;
 
+		
+		$timeout(function() {
+			var input = document.querySelector('#imageWidgetFileUpload'); // usa l'id corretto
+			if (input) {
+				input.addEventListener('change', function(event) {
+				$scope.setFile(event.target);
+				});
+			}
+		}, 0);
+
+
 		$scope.saveConfiguration = function() {
 			if ($scope.model.content.imgId == undefined) {
 				$scope.showAction($scope.translate.load('sbi.cockpit.widget.image.missingimg'));
@@ -154,7 +165,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		};
 
 		$scope.setFile = function(element) {
-			var max = 10 * 1024 * 1024;;
+			var max = 10 * 1024 * 1024;
 			if (element.files && element.files[0] && element.files[0].size > max) {
 				$scope.showAction('File too large. Max file size is: ' + max / 1024 / 1024 + 'MB');
 				element.value = null;

knowage/src/main/webapp/js/src/angular_1.4/tools/commons/upload-file/template/file-upload-base64.html

@@ -15,7 +15,7 @@ <h2>{{translate.format(translate.load('sbi.cockpit.widget.configuration'),transl
 							<!--  file-upload flex id="ImageUpload" ng-model="uploadImg"></file-upload-->
 							<md-content layout="row" layout-padding>
 								<!-- Simulate button and link the click event with the input type='file' -->
-								<input type="file" onchange='angular.element(this).scope().setFile(this)'/>
+								<input type="file" id="imageWidgetFileUpload" />
 							</md-content>
 
 							<md-button ng-click="upload($event)" aria-label="upload Menu"

knowagecockpitengine/src/main/webapp/js/src/angular_1.4/cockpit/directives/cockpit-widget/widget/imageWidget/imageWidget.js

@@ -24,6 +24,11 @@ angular.module('file_upload', [ 'ngMaterial', 'sbiModule'])
 	    controller: FileUploadControllerFunction,
 	    controllerAs: 'ctrl',
 	    link: function(scope, element, attrs, ctrl, transclude) {
+
+			var input = element.find('input')[0];
+			input.addEventListener('change', function () {
+				scope.ctrl.setFile(this);
+			});
 
 	    	scope.id = "fileUpload" + Math.floor(Math.random() * 1000);
 	    	if (attrs.id){
@@ -43,7 +48,8 @@ angular.module('file_upload', [ 'ngMaterial', 'sbiModule'])
 
 
 function FileUploadControllerFunction($scope,$timeout,$mdDialog,sbiModule_translate){
-	$scope.setFile = function (element){
+	var vm = this
+	vm.setFile = function (element){
 
 		var max = $scope.fileMaxSize != undefined ? $scope.fileMaxSize : defaultFileMaxSize;
 		var inputFile = element;

knowagecockpitengine/src/main/webapp/js/src/angular_1.4/cockpit/directives/cockpit-widget/widget/imageWidget/templates/imageWidgetEditPropertyTemplate.html

@@ -3,7 +3,7 @@
 	<label ng-disabled='ngDisabled' id="{{id}}" class="md-button md-knowage-theme md-raised md-ExtraMini" md-ink-ripple for="{{id}}_input">
 		<span >{{textButton}}</span>
 	</label>
-	<input  ng-disabled='ngDisabled' id="{{id}}_input" type="file" class="ng-hide" onchange='angular.element(this).scope().setFile(this)'>
+	<input  ng-disabled='ngDisabled' id="{{id}}_input" type="file" class="ng-hide">
 	<md-input-container flex='ngDisabled' >
 		<input type='text' disabled ng-model="fileName" aria-label="file name"/>
 	</md-input-container>