From 872ab9f14eecc9c93f80712db8edc81eaae8aca8 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Sat, 25 Aug 2012 14:55:49 +0800
Subject: [PATCH] [file upload,update]extracted upload_progress_js

---
 templates/repo_update_file.html               | 61 +-----------------
 templates/repo_upload_file.html               | 63 +------------------
 .../snippets/file_upload_progress_js.html     | 62 ++++++++++++++++++
 3 files changed, 64 insertions(+), 122 deletions(-)
 create mode 100644 templates/snippets/file_upload_progress_js.html

diff --git a/templates/repo_update_file.html b/templates/repo_update_file.html
index 96f4f0e772..baaf167903 100644
--- a/templates/repo_update_file.html
+++ b/templates/repo_update_file.html
@@ -36,64 +36,5 @@
 {% endblock %}
 
 {% block extra_script %}
-{% if not cloud_mode or not no_quota %}
-<script type="text/javascript">
-function gen_uuid() {
-    var uuid = "";
-    for (var i=0; i < 32; i++) {
-        uuid += Math.floor(Math.random() * 16).toString(16); 
-    }
-    return uuid;
-}
-
-function submit_and_real_time_show () {
-    var form = $('#upload-file-form')[0],
-        uuid = gen_uuid(); // id for this upload so we can fetch progress info.
-    $('#upload-progress').removeClass('hide');
-
-    // Append X-Progress-ID uuid form action
-    form.action += (form.action.indexOf('?') == -1 ? '?' : '&') + 'X-Progress-ID=' + uuid;
-    form.submit();
-    $('#upload-submit').addClass('hide');
-
-    // Update progress bar: not work in chrome. for ff.
-    function update_progress_info() {
-        $.ajax({
-            url: '{{ httpserver_root }}/upload_progress/?X-Progress-ID=' + uuid + '&callback=?', 
-            dataType: 'jsonp',
-            cache: false,
-            success: function(data) {
-                if (data) {
-                    $('#upload-progress-text').html(filesizeformat(data.uploaded) + ' / ' +  filesizeformat(data.length));
-                    $('#task-progress-bar').removeClass('hide').progressbar({
-                            value: data.uploaded / data.length * 100
-                    });
-                }
-            }
-        });
-        setTimeout(update_progress_info, 1000);
-    };
-    update_progress_info();
-
-    // Update progress bar: for chrome 
-    $('#request-progress').attr('src', '{{ SITE_ROOT }}file_upload_progress_page/?uuid=' + uuid);
-
-    return false;
-};
-
-$('#upload-submit').click(function () {
-    if (!$.trim($('#file').val())) {
-        $('#error-msg').html('请先选择一个文件');
-        return false;
-    }
-    $('#error-msg').addClass('hide');
-    submit_and_real_time_show();
-    return false;
-});
-
-$('#upload-cancel').click(function() {
-    location.reload(true);
-});
-</script>
-{% endif %}
+{% include 'snippets/file_upload_progress_js.html' %}
 {% endblock %}
diff --git a/templates/repo_upload_file.html b/templates/repo_upload_file.html
index 704ed12812..10c6bae41d 100644
--- a/templates/repo_upload_file.html
+++ b/templates/repo_upload_file.html
@@ -32,66 +32,5 @@
 {% endblock %}
 
 {% block extra_script %}
-{% if not cloud_mode or not no_quota %}
-<script type="text/javascript">
-function gen_uuid() {
-    var uuid = "";
-    for (var i=0; i < 32; i++) {
-        uuid += Math.floor(Math.random() * 16).toString(16); 
-    }
-    return uuid;
-}
-
-function submit_and_real_time_show () {
-    var form = $('#upload-file-form')[0],
-        uuid = gen_uuid(); // id for this upload so we can fetch progress info.
-    $('#upload-progress').removeClass('hide');
-
-    // Append X-Progress-ID uuid form action
-    form.action += (form.action.indexOf('?') == -1 ? '?' : '&') + 'X-Progress-ID=' + uuid;
-    form.submit();
-    $('#upload-submit').addClass('hide');
-
-    // Update progress bar: not work in chrome.
-    function update_progress_info() {
-        $.ajax({
-            url: '{{ httpserver_root }}/upload_progress/?X-Progress-ID=' + uuid + '&callback=?', 
-            dataType: 'jsonp',
-            cache: false,
-            success: function(data) {
-                if (data) {
-                    $('#upload-progress-text').html(filesizeformat(data.uploaded) + ' / ' +  filesizeformat(data.length));
-                    $('#task-progress-bar').removeClass('hide').progressbar({
-                            value: data.uploaded / data.length * 100
-                    });
-                }
-            }
-        });
-        setTimeout(update_progress_info, 1000);
-    };
-    update_progress_info();
-
-    // Update progress bar: for chrome 
-    if ($.browser.safari) {
-        $('#request-progress').attr('src', '{{ SITE_ROOT }}file_upload_progress_page/?uuid=' + uuid);
-    }
-
-    return false;
-};
-
-$('#upload-submit').click(function () {
-    if (!$.trim($('#file').val())) {
-        $('#error-msg').html('请先选择一个文件');
-        return false;
-    }
-    $('#error-msg').addClass('hide');
-    submit_and_real_time_show();
-    return false;
-});
-
-$('#upload-cancel').click(function() {
-    location.reload(true);
-});
-</script>
-{% endif %}
+{% include 'snippets/file_upload_progress_js.html' %}
 {% endblock %}
diff --git a/templates/snippets/file_upload_progress_js.html b/templates/snippets/file_upload_progress_js.html
new file mode 100644
index 0000000000..ff97145dbc
--- /dev/null
+++ b/templates/snippets/file_upload_progress_js.html
@@ -0,0 +1,62 @@
+{% if not cloud_mode or not no_quota %}
+<script type="text/javascript">
+function gen_uuid() {
+    var uuid = "";
+    for (var i=0; i < 32; i++) {
+        uuid += Math.floor(Math.random() * 16).toString(16); 
+    }
+    return uuid;
+}
+
+function submit_and_real_time_show () {
+    var form = $('#upload-file-form')[0],
+        uuid = gen_uuid(); // id for this upload so we can fetch progress info.
+    $('#upload-progress').removeClass('hide');
+
+    // Append X-Progress-ID uuid form action
+    form.action += (form.action.indexOf('?') == -1 ? '?' : '&') + 'X-Progress-ID=' + uuid;
+    form.submit();
+    $('#upload-submit').addClass('hide');
+
+    // Update progress bar: not work in chrome.
+    function update_progress_info() {
+        $.ajax({
+            url: '{{ httpserver_root }}/upload_progress/?X-Progress-ID=' + uuid + '&callback=?', 
+            dataType: 'jsonp',
+            cache: false,
+            success: function(data) {
+                if (data) {
+                    $('#upload-progress-text').html(filesizeformat(data.uploaded) + ' / ' +  filesizeformat(data.length));
+                    $('#task-progress-bar').removeClass('hide').progressbar({
+                            value: data.uploaded / data.length * 100
+                    });
+                }
+            }
+        });
+        setTimeout(update_progress_info, 1000);
+    };
+    update_progress_info();
+
+    // Update progress bar: for chrome 
+    if ($.browser.safari) {
+        $('#request-progress').attr('src', '{{ SITE_ROOT }}file_upload_progress_page/?uuid=' + uuid);
+    }
+
+    return false;
+};
+
+$('#upload-submit').click(function () {
+    if (!$.trim($('#file').val())) {
+        $('#error-msg').html('请先选择一个文件');
+        return false;
+    }
+    $('#error-msg').addClass('hide');
+    submit_and_real_time_show();
+    return false;
+});
+
+$('#upload-cancel').click(function() {
+    location.reload(true);
+});
+</script>
+{% endif %}