General fixes and test page

sjdweb · sjdweb · commit e2ad1d7438d2 · 2015-03-26T22:30:30.000Z
diff --git a/app/azureBlobUpload.js b/app/azureBlobUpload.js
@@ -108,7 +108,7 @@ angular.module('azureBlobStorage').factory('azureBlobUpload', [
                 return deferred.promise;
             }
 
-            var uri = state.blobUri + '&comp=block&blockid=' + block.getBlockId();
+            var uri = state.blobUri + '&comp=block&blockid=' + block.blockIdBase64;
             var requestData = block.data;
 
             if (requestData === null) {
@@ -336,7 +336,7 @@ angular.module('azureBlobStorage').factory('azureBlobUpload', [
 
             var requestBody = '<?xml version="1.0" encoding="utf-8"?><BlockList>';
             state.blocks.forEach(function(block) {
-                requestBody += '<Latest>' + block.getBlockId() + '</Latest>';
+                requestBody += '<Latest>' + block.blockIdBase64 + '</Latest>';
             });
             requestBody += '</BlockList>';
 
diff --git a/app/ngFileSelect.js b/app/ngFileSelect.js
@@ -0,0 +1,23 @@
+angular.module('azureBlobStorage').directive('ngFileSelect', [ '$parse', '$http', '$timeout', function($parse, $http, $timeout) {
+    return function(scope, elem, attr) {
+        var fn = $parse(attr.ngFileSelect);
+        elem.bind('change', function(evt) {
+            var files = [], fileList, i;
+            fileList = evt.target.files;
+            if (fileList !== null) {
+                for (i = 0; i < fileList.length; i++) {
+                    files.push(fileList.item(i));
+                }
+            }
+            $timeout(function() {
+                fn(scope, {
+                    $files : files,
+                    $event: evt
+                });
+            });
+        });
+        elem.bind('click', function(){
+            this.value = null;
+        });
+    };
+} ]);
diff --git a/index.html b/index.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <title>Angular Azure Blob</title>
+  </head>
+
+  <body ng-app="azureBlobStorage">
+    <div ng-controller="DemoController" class="container">
+      <form>
+        <input type="file" ng-file-select="selectFile($files)" />
+      </form>
+    </div>
+
+    <script type="text/javascript" src="libs/angular/angular.min.js"></script>
+    <script type="text/javascript" src="libs/underscore/underscore-min.js"></script>
+    <script type="text/javascript" src="libs/cryptojslib/rollups/md5.js"></script>
+    <script type="text/javascript" src="libs/cryptojslib/components/lib-typedarrays-min.js"></script>
+    <script type="text/javascript" src="dist/angular-azure-blob.js"></script>
+
+    <script type="text/javascript">
+      angular.module('azureBlobStorage').controller('DemoController', [
+        '$scope', 'azureBlobUpload', function ($scope, azureBlobUpload) {
+          $scope.selectFile = function (files) {
+            debugger;
+            azureBlobUpload.upload({
+                blobUri: 'xxx',
+                file: files[0],
+                process: function cb(){},
+                complete: function cb() {},
+                error: function cb() {},
+                blockSize: 1024, // optional
+                calculateFileMd5: false // optional, false by default
+            });
+          };
+        }]);
+    </script>
+  </body>
+</html>
