From 3c336f00d29ba927d41e2029a3c1d893cee43f9d Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Mon, 21 Mar 2016 06:47:01 +0100 Subject: Add login check witouth reloading page --- client/js/services/Image.js | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) (limited to 'client/js/services/Image.js') diff --git a/client/js/services/Image.js b/client/js/services/Image.js index decb5b2..d427e51 100644 --- a/client/js/services/Image.js +++ b/client/js/services/Image.js @@ -45,17 +45,42 @@ mainApp.factory('Image',[ '$http', 'Identity', function($http, Identity){ }; var uploadImage=function(fileToUpload, callback) { - - - var result=$http.post('../server/index.php', - $.param({"token" : Identity.getToken(), "task" : "image", 'action':'uploadImage', 'filename':fileToUpload, 'id':'6564'})); + var form_data = new FormData(); + form_data.append('file', fileToUpload); + console.log(fileToUpload) + form_data.append("task" , "image") + form_data.append("token" , Identity.getToken()) + form_data.append('action',"uploadImage") + form_data.append('id','6564') + form_data.append('file_name', fileToUpload.name); + + $.ajax({ + url: "../server/index.php", // Url to which the request is send + type: "POST", // Type of request to be send, called as method + data: form_data, // Data sent to server, a set of key/value pairs (i.e. form fields and values) + file_name:fileToUpload.name, + token : Identity.getToken(), + task : "image", + action:'uploadImage', + id:'6564', + contentType: false, // The content type used when sending data to the server. + cache: false, // To unable request pages to be cached + processData:false, // To send DOMDocument or non processed data file it is set to false + success: function(data) // A function to be called if request succeeds + { + alert("success") + } + }); + + //var result=$http.post('../server/index.php', + // $.param({"token" : Identity.getToken(), "task" : "image", 'action':'uploadImage', 'file_name':form_data, 'id':'6564'})); // Wait and handle the response - result.then(function (response){ + /* result.then(function (response){ callback(parseUploadImageAnswer(response, false)); },function(response){ callback(parseUploadImageAnswer(response, true)); - }); + });*/ -- cgit v1.2.3 From f4da4f285a4689e1d4eb8bb7d800d6570dfba6d0 Mon Sep 17 00:00:00 2001 From: manzerbredes Date: Mon, 28 Mar 2016 19:01:32 +0200 Subject: test --- client/js/services/Image.js | 4 ++-- server/Test/DisplayListCidr.php | 0 server/Test/getIdNetwork.php | 0 server/Test/getNetwork.php | 0 server/core/Automating.php | 0 server/core/Network.php~ | 0 server/vendor/php-opencloud/common/.travis.yml | 0 7 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 server/Test/DisplayListCidr.php mode change 100644 => 100755 server/Test/getIdNetwork.php mode change 100644 => 100755 server/Test/getNetwork.php mode change 100644 => 100755 server/core/Automating.php mode change 100644 => 100755 server/core/Network.php~ mode change 100644 => 100755 server/vendor/php-opencloud/common/.travis.yml (limited to 'client/js/services/Image.js') diff --git a/client/js/services/Image.js b/client/js/services/Image.js index d427e51..d6c9fed 100644 --- a/client/js/services/Image.js +++ b/client/js/services/Image.js @@ -52,13 +52,13 @@ mainApp.factory('Image',[ '$http', 'Identity', function($http, Identity){ form_data.append("token" , Identity.getToken()) form_data.append('action',"uploadImage") form_data.append('id','6564') - form_data.append('file_name', fileToUpload.name); + form_data.append('file_name', fileToUpload); $.ajax({ url: "../server/index.php", // Url to which the request is send type: "POST", // Type of request to be send, called as method data: form_data, // Data sent to server, a set of key/value pairs (i.e. form fields and values) - file_name:fileToUpload.name, + file_name:fileToUpload, token : Identity.getToken(), task : "image", action:'uploadImage', diff --git a/server/Test/DisplayListCidr.php b/server/Test/DisplayListCidr.php old mode 100644 new mode 100755 diff --git a/server/Test/getIdNetwork.php b/server/Test/getIdNetwork.php old mode 100644 new mode 100755 diff --git a/server/Test/getNetwork.php b/server/Test/getNetwork.php old mode 100644 new mode 100755 diff --git a/server/core/Automating.php b/server/core/Automating.php old mode 100644 new mode 100755 diff --git a/server/core/Network.php~ b/server/core/Network.php~ old mode 100644 new mode 100755 diff --git a/server/vendor/php-opencloud/common/.travis.yml b/server/vendor/php-opencloud/common/.travis.yml old mode 100644 new mode 100755 -- cgit v1.2.3