Cleaning out some unused stuff

i-e-b · i-e-b · commit 4981f2441644 · 2011-11-01T13:47:27.000Z
diff --git a/README b/README
@@ -2,7 +2,8 @@ A very basic framework around jQueryFileUpload scripts, to host in ASP.Net.
 
 TODO:
 =====
+ - Decouple UI from upload handers & templates a bit more? (less hooks by structure, more by class)
  - Ability to add placeholders for required dependencies (like the components of a .ism file)
  - Callbacks for current status (for post-upload processing, like transcodes)
  - Section divisions by classifications (different targets, like documents, videos etc)
- - Look at http://html5doctor.com/native-drag-and-drop/ for IE9 file drop? This one works: http://sandbox.knarly.com/js/dropfiles/
+ - Look at http://sandbox.knarly.com/js/dropfiles/ for IE9 file drop?
diff --git a/jQueryFileUpload.sln b/jQueryFileUpload.sln
@@ -3,6 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "jQueryFileUpload", "jQueryFileUpload\jQueryFileUpload.csproj", "{35500359-0CBA-4BFC-BAB6-319D14988AB9}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Files", "Files", "{20DAA377-C02F-434A-9258-43249F3DF592}"
+	ProjectSection(SolutionItems) = preProject
+		README = README
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/jQueryFileUpload/Default.aspx b/jQueryFileUpload/Default.aspx
@@ -16,21 +16,24 @@
 <head>
 <meta charset="utf-8">
 <title>jQuery File Upload Example</title>
-<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/themes/base/jquery-ui.css" id="theme">
-<link rel="stylesheet" href="styles/jquery.fileupload-ui.css">
-<link rel="stylesheet" href="styles/style.css">
+<!--[if lt IE 9]>
+<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
+<![endif]-->
+<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/themes/base/jquery-ui.css" id="theme" />
+<link rel="stylesheet" href="styles/jquery.fileupload-ui.css" />
+<link rel="stylesheet" href="styles/style.css" />
 </head>
 <body>
 <div id="fileupload">
-    <form action="FileTransferHandler.ashx" method="POST" enctype="multipart/form-data">
+    <form action="FileTransferHandler.ashx" method="post" enctype="multipart/form-data">
         <div class="fileupload-buttonbar">
             <label class="fileinput-button">
                 <span>Add files...</span>
                 <input type="file" name="files[]" multiple="multiple" />
             </label>
        <%-- <button type="submit" class="start">Start upload</button>
             <button type="reset" class="cancel">Cancel upload</button> --%>
-            <button type="button" class="delete">Delete all files</button>
+            <button type="button" class="delete button">Delete all files</button>
 			<div class="fileupload-progressbar"></div>
         </div>
     </form>
diff --git a/jQueryFileUpload/Default.aspx.designer.cs b/jQueryFileUpload/Default.aspx.designer.cs
diff --git a/jQueryFileUpload/scripts/jquery.fileupload-ui.js b/jQueryFileUpload/scripts/jquery.fileupload-ui.js
@@ -204,35 +204,6 @@
             }
         },
 
-        // Scales the given image (img HTML element)
-        // using the given options.
-        // Returns a canvas object if the canvas option is true
-        // and the browser supports canvas, else the scaled image:
-        _scaleImage: function (img, options) {
-            options = options || {};
-            var canvas = document.createElement('canvas'),
-                scale = Math.min(
-                    (options.maxWidth || img.width) / img.width,
-                    (options.maxHeight || img.height) / img.height
-                );
-            if (scale >= 1) {
-                scale = Math.max(
-                    (options.minWidth || img.width) / img.width,
-                    (options.minHeight || img.height) / img.height
-                );
-            }
-            img.width = parseInt(img.width * scale, 10);
-            img.height = parseInt(img.height * scale, 10);
-            if (!options.canvas || !canvas.getContext) {
-                return img;
-            }
-            canvas.width = img.width;
-            canvas.height = img.height;
-            canvas.getContext('2d')
-                .drawImage(img, 0, 0, img.width, img.height);
-            return canvas;
-        },
-
         _createObjectURL: function (file) {
             var undef = 'undefined',
                 urlAPI = (typeof window.createObjectURL !== undef && window) ||
@@ -264,29 +235,6 @@
             return false;
         },
 
-        // Loads an image for a given File object.
-        // Invokes the callback with an img or optional canvas
-        // element (if supported by the browser) as parameter:
-        _loadImage: function (file, callback, options) {
-            var that = this,
-                url,
-                img;
-            if (!options || !options.fileTypes ||
-                    options.fileTypes.test(file.type)) {
-                url = this._createObjectURL(file);
-                img = $('<img>').bind('load', function () {
-                    $(this).unbind('load');
-                    that._revokeObjectURL(url);
-                    callback(that._scaleImage(img[0], options));
-                }).prop('src', url);
-                if (!url) {
-                    this._loadFile(file, function (url) {
-                        img.prop('src', url);
-                    });
-                }
-            }
-        },
-
         // Link handler, that allows to download files
         // by drag & drop of the links to the desktop:
         _enableDragToDesktop: function () {
@@ -406,20 +354,6 @@
                     text: false,
                     icons: {primary: 'ui-icon-cancel'}
                 });
-            tmpl.find('.preview').each(function (index, node) {
-                that._loadImage(
-                    files[index],
-                    function (img) {
-                        $(img).hide().appendTo(node).fadeIn();
-                    },
-                    {
-                        maxWidth: options.previewMaxWidth,
-                        maxHeight: options.previewMaxHeight,
-                        fileTypes: options.previewFileTypes,
-                        canvas: options.previewAsCanvas
-                    }
-                );
-            });
             return tmpl;
         },
 
