From c7bacb91f553aac894bacdd69a00776e7f82e728 Mon Sep 17 00:00:00 2001 From: ultimatemember Date: Sat, 20 Dec 2014 18:02:41 +0200 Subject: [PATCH] Improved load time --- admin/assets/css/um-admin-columns.css | 4 +- admin/assets/css/um-admin-misc.css | 15 +- admin/assets/img/logo.png | Bin 0 -> 6792 bytes admin/assets/img/logo_small.png | Bin 0 -> 9501 bytes .../ReduxFramework/ReduxCore/framework.php | 34 +- admin/core/um-admin-columns.php | 35 +- admin/core/um-admin-enqueue.php | 21 +- admin/core/um-admin-notices.php | 20 - admin/core/um-admin-redux.php | 2 +- admin/templates/about.php | 99 ++ admin/templates/about_header.php | 24 + admin/templates/start.php | 99 ++ admin/templates/welcome.php | 0 admin/um-admin-init.php | 11 + assets/css/um-styles.css | 4 + assets/js/um-fileupload.js | 2 +- assets/js/um-jquery-form.js | 1277 +++++++++++++++++ core/um-account.php | 2 +- core/um-actions-global.php | 12 + core/um-actions-login.php | 4 +- core/um-actions-register.php | 4 +- core/um-actions-tracking.php | 6 +- core/um-enqueue.php | 3 + core/um-fields.php | 2 +- core/um-files.php | 4 +- core/um-filters-avatars.php | 3 +- core/um-form.php | 9 +- core/um-global-functions.php | 48 - core/um-query.php | 2 +- core/um-rewrite.php | 1 - core/um-setup.php | 3 + core/um-short-functions.php | 54 +- core/um-taxonomies.php | 28 +- core/um-uninstall.php | 8 +- index.php | 12 +- um-config.php | 34 +- um-init.php | 10 +- 37 files changed, 1710 insertions(+), 186 deletions(-) create mode 100644 admin/assets/img/logo.png create mode 100644 admin/assets/img/logo_small.png create mode 100644 admin/templates/about.php create mode 100644 admin/templates/about_header.php create mode 100644 admin/templates/start.php delete mode 100644 admin/templates/welcome.php create mode 100644 assets/js/um-jquery-form.js delete mode 100644 core/um-global-functions.php diff --git a/admin/assets/css/um-admin-columns.css b/admin/assets/css/um-admin-columns.css index 6f0f02d7..5bac6216 100644 --- a/admin/assets/css/um-admin-columns.css +++ b/admin/assets/css/um-admin-columns.css @@ -3,7 +3,7 @@ -moz-osx-font-smoothing: grayscale; } -.um-admin.post-type-um_form .manage-column.column-id {width: 40px} +.um-admin.post-type-um_form .manage-column.column-id {width: 60px} .um-admin.post-type-um_form .manage-column.column-mode {width: 100px} .um-admin.post-type-um_form .manage-column.column-title {width: 200px} .um-admin.post-type-um_form .manage-column.column-shortcode {width: 200px} @@ -32,7 +32,7 @@ .um-admin.post-type-um_directory td.column-shortcode, .um-admin.post-type-um_directory td.column-id, .um-admin.post-type-um_role td.column-count -{color: #aaa;font-size: 14px;} +{font-size: 14px;} .um-admin.users-php td.column-um_actions {padding-top: 12px} diff --git a/admin/assets/css/um-admin-misc.css b/admin/assets/css/um-admin-misc.css index 48d22ab8..11e05f7d 100644 --- a/admin/assets/css/um-admin-misc.css +++ b/admin/assets/css/um-admin-misc.css @@ -1,5 +1,15 @@ /* - - Columns + - Welcome +*/ + +.um-badge { + color: #fff; + background: none !important; + background: #3ba1da url(../img/logo_small.png) no-repeat center 0px !important; +} + +/* + - General */ body.um-admin-modal-open { @@ -8,9 +18,6 @@ body.um-admin-modal-open { .um-admin #major-publishing-actions{background-color: #fff !important;border-top:0} -.um-admin .postbox h3 { -background: #f9f9f9; -} .um-admin .postbox h3 i { font-size: 1.3em !important; vertical-align: middle !important; diff --git a/admin/assets/img/logo.png b/admin/assets/img/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..98a578c71db985fddbff04ce8397296cf8e9e387 GIT binary patch literal 6792 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 literal 0 HcmV?d00001 diff --git a/admin/assets/img/logo_small.png b/admin/assets/img/logo_small.png new file mode 100644 index 0000000000000000000000000000000000000000..43b514bf07e3beb2d217080fc761aa8e483f6860 GIT binary patch literal 9501 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 literal 0 HcmV?d00001 diff --git a/admin/core/lib/ReduxFramework/ReduxCore/framework.php b/admin/core/lib/ReduxFramework/ReduxCore/framework.php index dbae4d20..9614712b 100644 --- a/admin/core/lib/ReduxFramework/ReduxCore/framework.php +++ b/admin/core/lib/ReduxFramework/ReduxCore/framework.php @@ -1299,6 +1299,9 @@ * @return void */ public function _options_page() { + + $um_admin = new UM_Admin_API(); + $this->import_export->in_field(); if ( $this->args['menu_type'] == 'submenu' ) { @@ -1307,7 +1310,11 @@ add_menu_page( __('Ultimate Member', $this->slug), __('Ultimate Member', $this->slug), 'manage_options', $this->slug, array(&$this, 'admin_page'), 'dashicons-admin-users', '50.78578'); - add_submenu_page( '_welcome_to_um', __('Welcome to Ultimate Member!', $this->slug), __('Welcome to Ultimate Member!', $this->slug), 'manage_options', $this->slug . '-welcome', array(&$this, 'admin_page') ); + foreach( $um_admin->about_tabs as $k => $tab ) { + + add_submenu_page( '_'. $k . '_um', sprintf(__('%s | Ultimate Member', $this->slug), $tab), sprintf(__('%s | Ultimate Member', $this->slug), $tab), 'manage_options', $this->slug . '-' . $k, array(&$this, 'admin_page') ); + + } add_submenu_page( $this->slug, __('Dashboard', $this->slug), __('Dashboard', $this->slug), 'manage_options', $this->slug, array(&$this, 'admin_page') ); @@ -1321,11 +1328,11 @@ add_submenu_page( $this->slug, __('Forms', $this->slug), __('Forms', $this->slug), 'manage_options', 'edit.php?post_type=um_form', '', '' ); - add_submenu_page( $this->slug, __('Roles', $this->slug), __('Roles', $this->slug), 'manage_options', 'edit.php?post_type=um_role', '', '' ); + add_submenu_page( $this->slug, __('Member Levels', $this->slug), __('Member Levels', $this->slug), 'manage_options', 'edit.php?post_type=um_role', '', '' ); + + add_submenu_page( $this->slug, __('Member Directories', $this->slug), __('Member Directories', $this->slug), 'manage_options', 'edit.php?post_type=um_directory', '', '' ); add_submenu_page( $this->slug, __('Members', $this->slug), __('Members', $this->slug), 'manage_options', 'users.php', '', '' ); - - add_submenu_page( $this->slug, __('Directories', $this->slug), __('Directories', $this->slug), 'manage_options', 'edit.php?post_type=um_directory', '', '' ); } else { $this->page = add_menu_page( @@ -4311,11 +4318,26 @@ public function admin_page(){ + $um_admin = new UM_Admin_API(); + $page = $_REQUEST['page']; - if ( $page == 'ultimatemember') - + if ( $page == 'ultimatemember' ) { include_once um_path . 'admin/templates/dashboard.php'; + } + + if ( strstr( $page, 'ultimatemember-' ) ) { + + $template = str_replace('ultimatemember-','',$page); + $file = um_path . 'admin/templates/'. $template . '.php'; + + if ( file_exists( $file ) ){ + include_once um_path . 'admin/templates/'. $template . '.php'; + } else { + echo '

' . __('Please create a team.php template in admin templates.','ultimatemember') . '

'; + } + + } } diff --git a/admin/core/um-admin-columns.php b/admin/core/um-admin-columns.php index aecae9c3..596d72fc 100644 --- a/admin/core/um-admin-columns.php +++ b/admin/core/um-admin-columns.php @@ -22,10 +22,10 @@ class UM_Admin_Columns { $admin = new UM_Admin_Metabox(); $new_columns['cb'] = ''; - $new_columns['id'] = __('ID'); + $new_columns['id'] = __('ID') . $admin->_tooltip( 'Unique ID for each form' ); $new_columns['title'] = __('Title'); - $new_columns['mode'] = __('Type'); - $new_columns['shortcode'] = __('Shortcode') . $admin->_tooltip( 'Copy this shortcode to any post/page to display the relevant form' ); + $new_columns['mode'] = __('Type') . $admin->_tooltip( 'This is the type of the form' ); + $new_columns['shortcode'] = __('Shortcode') . $admin->_tooltip( 'Use this shortcode to display the form' ); $new_columns['impressions'] = __('Impressions') . $admin->_tooltip( 'The total number of times this form has been viewed' ); $new_columns['conversions'] = __('Conversions') . $admin->_tooltip( 'The total number of conversions. e.g. Successful sign-ups' ); $new_columns['date'] = __('Date'); @@ -33,6 +33,23 @@ class UM_Admin_Columns { return $new_columns; } + + /*** + *** @Custom columns for Directory + ***/ + function manage_edit_um_directory_columns($columns) { + + $admin = new UM_Admin_Metabox(); + + $new_columns['cb'] = ''; + $new_columns['id'] = __('ID') . $admin->_tooltip( 'Unique ID for each form' ); + $new_columns['title'] = __('Title'); + $new_columns['shortcode'] = __('Shortcode') . $admin->_tooltip( 'Use this shortcode to display the member directory' ); + $new_columns['date'] = __('Date'); + + return $new_columns; + + } /*** *** @Display cusom columns for Form @@ -75,18 +92,6 @@ class UM_Admin_Columns { } } - - /*** - *** @Custom columns for Directory - ***/ - function manage_edit_um_directory_columns($columns) { - $new_columns['cb'] = ''; - $new_columns['id'] = __('ID'); - $new_columns['title'] = __('Title'); - $new_columns['shortcode'] = __('Shortcode'); - $new_columns['date'] = __('Date'); - return $new_columns; - } /*** *** @Display cusom columns for Directory diff --git a/admin/core/um-admin-enqueue.php b/admin/core/um-admin-enqueue.php index c9e16b69..5b5d27ba 100644 --- a/admin/core/um-admin-enqueue.php +++ b/admin/core/um-admin-enqueue.php @@ -12,10 +12,25 @@ class UM_Admin_Enqueue { add_filter('admin_body_class', array(&$this, 'admin_body_class'), 9 ); - add_filter( 'enter_title_here', array(&$this, 'enter_title_here') ); + add_filter('enter_title_here', array(&$this, 'enter_title_here') ); + add_filter('admin_footer_text', array(&$this, 'admin_footer_text') ); + } + /*** + *** @Show footer text + ***/ + function admin_footer_text() { + $copyright = sprintf(__('Thank you for creating with Ultimate Member and WordPress.','ultimatemember')); + + if ( um_get_option('admin_load_time') == 1 ) { + $copyright .= '
' . sprintf(__('%1$s queries made in %2$s seconds','ultimatemember'), get_num_queries(), timer_stop(0) ); + } + + return '' . $copyright . ''; + } + /*** *** @enter title placeholder ***/ @@ -42,8 +57,8 @@ class UM_Admin_Enqueue { if ( strstr($screen_id, 'um_form') ) $highlighted_id = 3; if ( strstr($screen_id, 'um_role') ) $highlighted_id = 4; - if ( strstr($screen_id, 'um_directory') ) $highlighted_id = 6; - if ( strstr($screen_id, 'user') || strstr($screen_id, 'profile') ) $highlighted_id = 5; + if ( strstr($screen_id, 'um_directory') ) $highlighted_id = 5; + if ( strstr($screen_id, 'user') || strstr($screen_id, 'profile') ) $highlighted_id = 6; if ( isset($highlighted_id) ) { ?> diff --git a/admin/core/um-admin-notices.php b/admin/core/um-admin-notices.php index 3c47a5d7..20446390 100644 --- a/admin/core/um-admin-notices.php +++ b/admin/core/um-admin-notices.php @@ -5,9 +5,6 @@ class UM_Admin_Notices { function __construct() { add_action('admin_notices', array(&$this, 'admin_notices')); - - add_action('admin_notices', array(&$this, 'um_admin_notices')); - } /*** @@ -47,21 +44,4 @@ class UM_Admin_Notices { } - /*** - *** @For custom-styled notices - ***/ - function um_admin_notices() { - - $notices = get_option('um_admin_notices'); - if ( $notices ) { - - foreach($notices as $notice){ - echo "
-
$notice
-
"; - } - - } - } - } \ No newline at end of file diff --git a/admin/core/um-admin-redux.php b/admin/core/um-admin-redux.php index 3386a451..a9cee43a 100644 --- a/admin/core/um-admin-redux.php +++ b/admin/core/um-admin-redux.php @@ -61,7 +61,7 @@ 'google_api_key' => '', // Must be defined to add google fonts to the typography module 'async_typography' => true, // Use a asynchronous font on the front end or font string - 'admin_bar' => true, // Show the panel pages on the admin bar + 'admin_bar' => false, // Show the panel pages on the admin bar 'global_variable' => '', // Set a different name for your global variable other than the opt_name 'dev_mode' => false, // Show the time the page took to load, etc 'customizer' => false, // Enable basic customizer support diff --git a/admin/templates/about.php b/admin/templates/about.php new file mode 100644 index 00000000..9cb27749 --- /dev/null +++ b/admin/templates/about.php @@ -0,0 +1,99 @@ +
+ + + +
+

Introducing Twenty Fifteen

+
+ +
+ +
+
+

Our newest default theme, Twenty Fifteen, is a blog-focused theme designed for clarity.

+

Twenty Fifteen has flawless language support, with help from Google’s Noto font family.

+

The straightforward typography is readable on any screen size.

+

Your content always takes center stage, whether viewed on a phone, tablet, laptop, or desktop computer.

+
+
+ +
+
+ +
+
+ +
+ +
+

Distraction-free writing

+
+
+ +
+

Just write.

+

Sometimes, you just need to concentrate on putting your thoughts into words. Try turning on distraction-free writing mode. When you start typing, all the distractions will fade away, letting you focus solely on your writing. All your editing tools instantly return when you need them.

+
+
+ +
+ +
+

The Finer Points

+ +
+
+

Choose a language

+

Right now, WordPress 4.1 is already translated into 40 languages, with more always in progress. You can switch to any translation on the General Settings screen.

+
+ +
+

Vine embeds

+

Embedding videos from Vine is as simple as pasting a URL onto its own line in a post. See the full list of supported embeds.

+
+ +
+

Log out everywhere

+

If you’ve ever worried you forgot to sign out from a shared computer, you can now go to your profile and log out everywhere.

+
+ +
+

Plugin recommendations

+

The plugin installer suggests plugins for you to try. Recommendations are based on the plugins you and other users have installed.

+
+ +
+ +
+ +
+ +
+

Under the Hood

+ +
+
+

Complex Queries

+

Metadata, date, and term queries now support advanced conditional logic, like nested clauses and multiple operators — A AND ( B OR C ).

+ +

Customizer API

+

Expanded JavaScript APIs in the customizer enable a new media experience as well as dynamic and contextual controls, sections, and panels.

+
+
+

<title> tags in themes

+

add_theme_support( 'title-tag' ) tells WordPress to handle the complexities of document titles.

+ +

Developer Reference

+

Continued improvements to inline code documentation have made the developer reference more complete than ever.

+
+
+ +
+ +
+ Go to Plugin Dashboard → +
+ +
+ +
\ No newline at end of file diff --git a/admin/templates/about_header.php b/admin/templates/about_header.php new file mode 100644 index 00000000..97f0cbc7 --- /dev/null +++ b/admin/templates/about_header.php @@ -0,0 +1,24 @@ + +

Welcome to Ultimate Member

+ +
Thank you for installing! Ultimate Member is a powerful community and membership plugin that allows you to create beautiful community and membership sites with WordPress.
+ +
Version
+ +

+ + about_tabs as $k => $tab ) { + + if ( $k == $template ) { + $active = 'nav-tab-active'; + } else { + $active = ''; + } + + ?> + + + + + +

\ No newline at end of file diff --git a/admin/templates/start.php b/admin/templates/start.php new file mode 100644 index 00000000..edf8b46d --- /dev/null +++ b/admin/templates/start.php @@ -0,0 +1,99 @@ +
+ + + +
+

Introducing Twenty Fifteen

+
+ +
+ +
+
+

Our newest default theme, Twenty Fifteen, is a blog-focused theme designed for clarity.

+

Twenty Fifteen has flawless language support, with help from Google’s Noto font family.

+

The straightforward typography is readable on any screen size.

+

Your content always takes center stage, whether viewed on a phone, tablet, laptop, or desktop computer.

+
+
+ +
+
+ +
+
+ +
+ +
+

Distraction-free writing

+
+
+ +
+

Just write.

+

Sometimes, you just need to concentrate on putting your thoughts into words. Try turning on distraction-free writing mode. When you start typing, all the distractions will fade away, letting you focus solely on your writing. All your editing tools instantly return when you need them.

+
+
+ +
+ +
+

The Finer Points

+ +
+
+

Choose a language

+

Right now, WordPress 4.1 is already translated into 40 languages, with more always in progress. You can switch to any translation on the General Settings screen.

+
+ +
+

Vine embeds

+

Embedding videos from Vine is as simple as pasting a URL onto its own line in a post. See the full list of supported embeds.

+
+ +
+

Log out everywhere

+

If you’ve ever worried you forgot to sign out from a shared computer, you can now go to your profile and log out everywhere.

+
+ +
+

Plugin recommendations

+

The plugin installer suggests plugins for you to try. Recommendations are based on the plugins you and other users have installed.

+
+ +
+ +
+ +
+ +
+

Under the Hood

+ +
+
+

Complex Queries

+

Metadata, date, and term queries now support advanced conditional logic, like nested clauses and multiple operators — A AND ( B OR C ).

+ +

Customizer API

+

Expanded JavaScript APIs in the customizer enable a new media experience as well as dynamic and contextual controls, sections, and panels.

+
+
+

<title> tags in themes

+

add_theme_support( 'title-tag' ) tells WordPress to handle the complexities of document titles.

+ +

Developer Reference

+

Continued improvements to inline code documentation have made the developer reference more complete than ever.

+
+
+ +
+ +
+ Go to Plugin Dashboard → +
+ +
+ +
\ No newline at end of file diff --git a/admin/templates/welcome.php b/admin/templates/welcome.php deleted file mode 100644 index e69de29b..00000000 diff --git a/admin/um-admin-init.php b/admin/um-admin-init.php index 89e7daab..70295881 100644 --- a/admin/um-admin-init.php +++ b/admin/um-admin-init.php @@ -8,6 +8,17 @@ class UM_Admin_API { add_action('admin_init', array(&$this, 'admin_init'), 0); + if ( !class_exists( 'ReduxFramework' ) && file_exists( um_path . 'admin/core/lib/ReduxFramework/ReduxCore/framework.php' ) ) { + require_once( um_path . 'admin/core/lib/ReduxFramework/ReduxCore/framework.php' ); + } + if ( file_exists ( um_path . 'admin/core/um-admin-redux.php' ) ) { + require_once( um_path . 'admin/core/um-admin-redux.php' ); + } + + + $this->about_tabs['about'] = 'About'; + $this->about_tabs['start'] = 'Getting Started'; + } /*** diff --git a/assets/css/um-styles.css b/assets/css/um-styles.css index 1c8fcb33..b6bd28c7 100644 --- a/assets/css/um-styles.css +++ b/assets/css/um-styles.css @@ -26,6 +26,10 @@ box-sizing: content-box; } +.um a:focus { + outline: 0 !important; +} + /* only in admin mode */ .um.um-in-admin { padding-top: 0; diff --git a/assets/js/um-fileupload.js b/assets/js/um-fileupload.js index c5e82d85..9f02a168 100644 --- a/assets/js/um-fileupload.js +++ b/assets/js/um-fileupload.js @@ -5,4 +5,4 @@ * Copyright (c) 2013 Ravishanker Kusuma * http://hayageek.com/ */ -(function(b){if(b.fn.ajaxForm==undefined){b.getScript("http://malsup.github.io/jquery.form.js")}var a={};a.fileapi=b("").get(0).files!==undefined;a.formdata=window.FormData!==undefined;b.fn.uploadFile=function(t){var r=b.extend({url:"",method:"POST",enctype:"multipart/form-data",formData:null,returnType:null,allowedTypes:"*",fileName:"file",formData:{},dynamicFormData:function(){return{}},maxFileSize:-1,maxFileCount:-1,multiple:true,dragDrop:true,autoSubmit:true,showCancel:true,showAbort:true,showDone:true,showDelete:false,showError:true,showStatusAfterSuccess:true,showStatusAfterError:true,showFileCounter:true,fileCounterStyle:"). ",showProgress:false,onSelect:function(s){return true},onSubmit:function(s,u){},onSuccess:function(u,s,v){},onError:function(v,s,u){},deleteCallback:false,afterUploadAll:false,uploadButtonClass:"upload",dragDropStr:"",abortStr:"Abort",cancelStr:"Cancel",deletelStr:"Delete",doneStr:"Done",multiDragErrorStr:"Multiple File Drag & Drop is not allowed.",extErrorStr:"",sizeErrorStr:"",uploadErrorStr:"Upload is not allowed",maxFileCountErrorStr:""},t);this.fileCounter=1;this.selectedFiles=0;this.fCounter=0;this.sCounter=0;this.tCounter=0;var d="upload-"+(new Date().getTime());this.formGroup=d;this.hide();this.errorLog=b("
");this.after(this.errorLog);this.responses=[];if(!a.formdata){r.dragDrop=false}if(!a.formdata){r.multiple=false}var m=this;var e=b("
"+b(this).html()+"
");b(e).addClass(r.uploadButtonClass);(function k(){if(b.fn.ajaxForm){if(r.dragDrop){var s=b('
');b(m).before(s);b(s).append(e);b(s).prepend(b(r.dragDropStr));f(m,r,s)}else{b(m).before(e)}q(m,d,r,e)}else{window.setTimeout(k,10)}})();this.startUpload=function(){b("."+this.formGroup).each(function(u,s){if(b(this).is("form")){b(this).submit()}})};this.stopUpload=function(){b(".upload-red").each(function(u,s){if(b(this).hasClass(m.formGroup)){b(this).click()}})};this.getResponses=function(){return this.responses};var g=false;function j(){if(r.afterUploadAll&&!g){g=true;(function s(){if(m.sCounter!=0&&(m.sCounter+m.fCounter==m.tCounter)){r.afterUploadAll(m);g=false}else{window.setTimeout(s,100)}})()}}function f(w,u,v){v.on("dragenter",function(s){s.stopPropagation();s.preventDefault();b(this).css("border","3px dashed #ddd")});v.on("dragover",function(s){s.stopPropagation();s.preventDefault()});v.on("drop",function(x){b(this).css("border","3px dashed #ddd");x.preventDefault();w.errorLog.html("");var s=x.originalEvent.dataTransfer.files;if(!u.multiple&&s.length>1){if(u.showError){b("
"+u.multiDragErrorStr+"
").appendTo(w.errorLog)}return}if(u.onSelect(s)==false){return}l(u,w,s)});b(document).on("dragenter",function(s){s.stopPropagation();s.preventDefault()});b(document).on("dragover",function(s){s.stopPropagation();s.preventDefault();v.css("border","3px dashed #ddd")});b(document).on("drop",function(s){s.stopPropagation();s.preventDefault();v.css("border","3px dashed #ddd")})}function i(s){var v="";var u=s/1024;if(parseInt(u)>1024){var w=u/1024;v=w.toFixed(2)+" MB"}else{v=u.toFixed(2)+" KB"}return v}function o(x){var y=[];if(jQuery.type(x)=="string"){y=x.split("&")}else{y=b.param(x).split("&")}var u=y.length;var s=[];var w,v;for(w=0;w"+H.extErrorStr+"").appendTo(B.errorLog)}continue}if(H.maxFileSize!=-1&&u[C].size>H.maxFileSize){if(H.showError){b("
"+H.sizeErrorStr+"
").appendTo(B.errorLog)}continue}if(H.maxFileCount!=-1&&B.selectedFiles>=H.maxFileCount){if(H.showError){b("
"+H.maxFileCountErrorStr+"
").appendTo(B.errorLog)}continue}B.selectedFiles++;var D=H;var w=new FormData();var A=H.fileName.replace("[]","");w.append(A,u[C]);var y=H.formData;if(y){var F=o(y);for(var z=0;z");v.appendTo("body");var x=[];x.push(u[C].name);n(v,D,E,x,B);B.fileCounter++}}function c(w,v,y){var x=v.allowedTypes.toLowerCase().split(",");var u=y.split(".").pop().toLowerCase();if(v.allowedTypes!="*"&&jQuery.inArray(u,x)<0){return false}return true}function h(u,w){if(u.showFileCounter){var v=b(".upload-filename").length;w.fileCounter=v+1;b(".upload-filename").each(function(A,y){var s=b(this).html().split(u.fileCounterStyle);var x=parseInt(s[0])-1;var z=v+u.fileCounterStyle+s[1];b(this).html(z);v--})}}function q(y,B,D,u){var A="ajax-upload-id-"+(new Date().getTime());var w=b("
");var v="";if(D.multiple){if(D.fileName.indexOf("[]")!=D.fileName.length-2){D.fileName+="[]"}v=""}var z=b(v).appendTo(w);z.change(function(){y.errorLog.html("");var K=D.allowedTypes.toLowerCase().split(",");var G=[];if(this.files){for(H=0;H"+D.extErrorStr+"").appendTo(y.errorLog)}return}F.push({name:I,size:"NA"});if(D.onSelect(F)==false){return}}h(D,y);u.unbind("click");w.hide();q(y,B,D,u);w.addClass(B);if(a.fileapi&&a.formdata){w.removeClass(B);var J=this.files;l(D,y,J)}else{var E="";for(var H=0;H"}else{E+=G[H]+"
"}y.fileCounter++}if(D.maxFileCount!=-1&&(y.selectedFiles+G.length)>D.maxFileCount){if(D.showError){b("
"+D.maxFileCountErrorStr+"
").appendTo(y.errorLog)}return}y.selectedFiles+=G.length;var s=new p(y,D);s.filename.html(E);n(w,D,s,G,y)}});w.css({margin:0,padding:0});var C=b(u).width()+10;if(C==10){C=120}var x=u.height()+10;if(x==10){x=35}u.css({position:"relative",overflow:"hidden",cursor:"default"});z.css({position:"absolute",cursor:"pointer",top:"0px",width:'100%',height:'34px',left:"0px","z-index":"100",opacity:"0.0",filter:"alpha(opacity=0)","-ms-filter":"alpha(opacity=0)","-khtml-opacity":"0.0","-moz-opacity":"0.0"});w.appendTo(u)}function p(v,u){this.statusbar=b("
");this.filename=b("
").appendTo(this.statusbar);this.progressDiv=b("
").appendTo(this.statusbar).hide();this.progressbar=b("
").appendTo(this.progressDiv);this.abort=b("
"+u.abortStr+"
").appendTo(this.statusbar).hide();this.cancel=b("
"+u.cancelStr+"
").appendTo(this.statusbar).hide();this.done=b("
"+u.doneStr+"
").appendTo(this.statusbar).hide();this.del=b("
"+u.deletelStr+"
").appendTo(this.statusbar).hide();v.errorLog.after(this.statusbar);return this}function n(z,y,u,w,A){var x=null;var v={cache:false,contentType:false,processData:false,forceSync:false,data:y.formData,formData:y.fileData,dataType:y.returnType,beforeSubmit:function(F,C,E){if(y.onSubmit.call(this,w)!=false){var B=y.dynamicFormData();if(B){var s=o(B);if(s){for(var D=0;D"+y.uploadErrorStr+"
");u.cancel.show();z.remove();u.cancel.click(function(){u.statusbar.remove()});return false},beforeSend:function(B,s){u.progressDiv.show();u.cancel.hide();u.done.hide();if(y.showAbort){u.abort.show();u.abort.click(function(){B.abort();A.selectedFiles-=w.length})}if(!a.formdata){u.progressbar.width("5%")}else{u.progressbar.width("1%")}},uploadProgress:function(E,s,D,C){if(C>98){C=98}var B=C+"%";if(C>1){u.progressbar.width(B)}if(y.showProgress){u.progressbar.html(B);u.progressbar.css("text-align","center")}},success:function(B,s,C){A.responses.push(B);u.progressbar.width("100%");if(y.showProgress){u.progressbar.html("100%");u.progressbar.css("text-align","center")}u.abort.hide();y.onSuccess.call(this,w,B,C);if(y.showStatusAfterSuccess){if(y.showDone){u.done.show();u.done.click(function(){u.statusbar.hide("slow");u.statusbar.remove()})}else{u.done.hide()}if(y.showDelete){u.del.show();u.del.click(function(){u.statusbar.hide().remove();if(y.deleteCallback){y.deleteCallback.call(this,B,u)}A.selectedFiles-=w.length;h(y,A)})}else{u.del.hide()}}else{u.statusbar.hide("slow");u.statusbar.remove()}z.remove();A.sCounter+=w.length},error:function(C,s,B){u.abort.hide();if(C.statusText=="abort"){u.statusbar.hide("slow").remove();h(y,A)}else{y.onError.call(this,w,s,B);if(y.showStatusAfterError){u.progressDiv.hide();u.statusbar.append("ERROR: "+B+"")}else{u.statusbar.hide();u.statusbar.remove()}A.selectedFiles-=w.length}z.remove();A.fCounter+=w.length}};if(y.autoSubmit){z.ajaxSubmit(v)}else{if(y.showCancel){u.cancel.show();u.cancel.click(function(){z.remove();u.statusbar.remove();A.selectedFiles-=w.length;h(y,A)})}z.ajaxForm(v)}}return this}}(jQuery)); \ No newline at end of file +(function(b){if(b.fn.ajaxForm==undefined){}var a={};a.fileapi=b("").get(0).files!==undefined;a.formdata=window.FormData!==undefined;b.fn.uploadFile=function(t){var r=b.extend({url:"",method:"POST",enctype:"multipart/form-data",formData:null,returnType:null,allowedTypes:"*",fileName:"file",formData:{},dynamicFormData:function(){return{}},maxFileSize:-1,maxFileCount:-1,multiple:true,dragDrop:true,autoSubmit:true,showCancel:true,showAbort:true,showDone:true,showDelete:false,showError:true,showStatusAfterSuccess:true,showStatusAfterError:true,showFileCounter:true,fileCounterStyle:"). ",showProgress:false,onSelect:function(s){return true},onSubmit:function(s,u){},onSuccess:function(u,s,v){},onError:function(v,s,u){},deleteCallback:false,afterUploadAll:false,uploadButtonClass:"upload",dragDropStr:"",abortStr:"Abort",cancelStr:"Cancel",deletelStr:"Delete",doneStr:"Done",multiDragErrorStr:"Multiple File Drag & Drop is not allowed.",extErrorStr:"",sizeErrorStr:"",uploadErrorStr:"Upload is not allowed",maxFileCountErrorStr:""},t);this.fileCounter=1;this.selectedFiles=0;this.fCounter=0;this.sCounter=0;this.tCounter=0;var d="upload-"+(new Date().getTime());this.formGroup=d;this.hide();this.errorLog=b("
");this.after(this.errorLog);this.responses=[];if(!a.formdata){r.dragDrop=false}if(!a.formdata){r.multiple=false}var m=this;var e=b("
"+b(this).html()+"
");b(e).addClass(r.uploadButtonClass);(function k(){if(b.fn.ajaxForm){if(r.dragDrop){var s=b('
');b(m).before(s);b(s).append(e);b(s).prepend(b(r.dragDropStr));f(m,r,s)}else{b(m).before(e)}q(m,d,r,e)}else{window.setTimeout(k,10)}})();this.startUpload=function(){b("."+this.formGroup).each(function(u,s){if(b(this).is("form")){b(this).submit()}})};this.stopUpload=function(){b(".upload-red").each(function(u,s){if(b(this).hasClass(m.formGroup)){b(this).click()}})};this.getResponses=function(){return this.responses};var g=false;function j(){if(r.afterUploadAll&&!g){g=true;(function s(){if(m.sCounter!=0&&(m.sCounter+m.fCounter==m.tCounter)){r.afterUploadAll(m);g=false}else{window.setTimeout(s,100)}})()}}function f(w,u,v){v.on("dragenter",function(s){s.stopPropagation();s.preventDefault();b(this).css("border","3px dashed #ddd")});v.on("dragover",function(s){s.stopPropagation();s.preventDefault()});v.on("drop",function(x){b(this).css("border","3px dashed #ddd");x.preventDefault();w.errorLog.html("");var s=x.originalEvent.dataTransfer.files;if(!u.multiple&&s.length>1){if(u.showError){b("
"+u.multiDragErrorStr+"
").appendTo(w.errorLog)}return}if(u.onSelect(s)==false){return}l(u,w,s)});b(document).on("dragenter",function(s){s.stopPropagation();s.preventDefault()});b(document).on("dragover",function(s){s.stopPropagation();s.preventDefault();v.css("border","3px dashed #ddd")});b(document).on("drop",function(s){s.stopPropagation();s.preventDefault();v.css("border","3px dashed #ddd")})}function i(s){var v="";var u=s/1024;if(parseInt(u)>1024){var w=u/1024;v=w.toFixed(2)+" MB"}else{v=u.toFixed(2)+" KB"}return v}function o(x){var y=[];if(jQuery.type(x)=="string"){y=x.split("&")}else{y=b.param(x).split("&")}var u=y.length;var s=[];var w,v;for(w=0;w"+H.extErrorStr+"").appendTo(B.errorLog)}continue}if(H.maxFileSize!=-1&&u[C].size>H.maxFileSize){if(H.showError){b("
"+H.sizeErrorStr+"
").appendTo(B.errorLog)}continue}if(H.maxFileCount!=-1&&B.selectedFiles>=H.maxFileCount){if(H.showError){b("
"+H.maxFileCountErrorStr+"
").appendTo(B.errorLog)}continue}B.selectedFiles++;var D=H;var w=new FormData();var A=H.fileName.replace("[]","");w.append(A,u[C]);var y=H.formData;if(y){var F=o(y);for(var z=0;z");v.appendTo("body");var x=[];x.push(u[C].name);n(v,D,E,x,B);B.fileCounter++}}function c(w,v,y){var x=v.allowedTypes.toLowerCase().split(",");var u=y.split(".").pop().toLowerCase();if(v.allowedTypes!="*"&&jQuery.inArray(u,x)<0){return false}return true}function h(u,w){if(u.showFileCounter){var v=b(".upload-filename").length;w.fileCounter=v+1;b(".upload-filename").each(function(A,y){var s=b(this).html().split(u.fileCounterStyle);var x=parseInt(s[0])-1;var z=v+u.fileCounterStyle+s[1];b(this).html(z);v--})}}function q(y,B,D,u){var A="ajax-upload-id-"+(new Date().getTime());var w=b("
");var v="";if(D.multiple){if(D.fileName.indexOf("[]")!=D.fileName.length-2){D.fileName+="[]"}v=""}var z=b(v).appendTo(w);z.change(function(){y.errorLog.html("");var K=D.allowedTypes.toLowerCase().split(",");var G=[];if(this.files){for(H=0;H"+D.extErrorStr+"").appendTo(y.errorLog)}return}F.push({name:I,size:"NA"});if(D.onSelect(F)==false){return}}h(D,y);u.unbind("click");w.hide();q(y,B,D,u);w.addClass(B);if(a.fileapi&&a.formdata){w.removeClass(B);var J=this.files;l(D,y,J)}else{var E="";for(var H=0;H"}else{E+=G[H]+"
"}y.fileCounter++}if(D.maxFileCount!=-1&&(y.selectedFiles+G.length)>D.maxFileCount){if(D.showError){b("
"+D.maxFileCountErrorStr+"
").appendTo(y.errorLog)}return}y.selectedFiles+=G.length;var s=new p(y,D);s.filename.html(E);n(w,D,s,G,y)}});w.css({margin:0,padding:0});var C=b(u).width()+10;if(C==10){C=120}var x=u.height()+10;if(x==10){x=35}u.css({position:"relative",overflow:"hidden",cursor:"default"});z.css({position:"absolute",cursor:"pointer",top:"0px",width:'100%',height:'34px',left:"0px","z-index":"100",opacity:"0.0",filter:"alpha(opacity=0)","-ms-filter":"alpha(opacity=0)","-khtml-opacity":"0.0","-moz-opacity":"0.0"});w.appendTo(u)}function p(v,u){this.statusbar=b("
");this.filename=b("
").appendTo(this.statusbar);this.progressDiv=b("
").appendTo(this.statusbar).hide();this.progressbar=b("
").appendTo(this.progressDiv);this.abort=b("
"+u.abortStr+"
").appendTo(this.statusbar).hide();this.cancel=b("
"+u.cancelStr+"
").appendTo(this.statusbar).hide();this.done=b("
"+u.doneStr+"
").appendTo(this.statusbar).hide();this.del=b("
"+u.deletelStr+"
").appendTo(this.statusbar).hide();v.errorLog.after(this.statusbar);return this}function n(z,y,u,w,A){var x=null;var v={cache:false,contentType:false,processData:false,forceSync:false,data:y.formData,formData:y.fileData,dataType:y.returnType,beforeSubmit:function(F,C,E){if(y.onSubmit.call(this,w)!=false){var B=y.dynamicFormData();if(B){var s=o(B);if(s){for(var D=0;D"+y.uploadErrorStr+"
");u.cancel.show();z.remove();u.cancel.click(function(){u.statusbar.remove()});return false},beforeSend:function(B,s){u.progressDiv.show();u.cancel.hide();u.done.hide();if(y.showAbort){u.abort.show();u.abort.click(function(){B.abort();A.selectedFiles-=w.length})}if(!a.formdata){u.progressbar.width("5%")}else{u.progressbar.width("1%")}},uploadProgress:function(E,s,D,C){if(C>98){C=98}var B=C+"%";if(C>1){u.progressbar.width(B)}if(y.showProgress){u.progressbar.html(B);u.progressbar.css("text-align","center")}},success:function(B,s,C){A.responses.push(B);u.progressbar.width("100%");if(y.showProgress){u.progressbar.html("100%");u.progressbar.css("text-align","center")}u.abort.hide();y.onSuccess.call(this,w,B,C);if(y.showStatusAfterSuccess){if(y.showDone){u.done.show();u.done.click(function(){u.statusbar.hide("slow");u.statusbar.remove()})}else{u.done.hide()}if(y.showDelete){u.del.show();u.del.click(function(){u.statusbar.hide().remove();if(y.deleteCallback){y.deleteCallback.call(this,B,u)}A.selectedFiles-=w.length;h(y,A)})}else{u.del.hide()}}else{u.statusbar.hide("slow");u.statusbar.remove()}z.remove();A.sCounter+=w.length},error:function(C,s,B){u.abort.hide();if(C.statusText=="abort"){u.statusbar.hide("slow").remove();h(y,A)}else{y.onError.call(this,w,s,B);if(y.showStatusAfterError){u.progressDiv.hide();u.statusbar.append("ERROR: "+B+"")}else{u.statusbar.hide();u.statusbar.remove()}A.selectedFiles-=w.length}z.remove();A.fCounter+=w.length}};if(y.autoSubmit){z.ajaxSubmit(v)}else{if(y.showCancel){u.cancel.show();u.cancel.click(function(){z.remove();u.statusbar.remove();A.selectedFiles-=w.length;h(y,A)})}z.ajaxForm(v)}}return this}}(jQuery)); \ No newline at end of file diff --git a/assets/js/um-jquery-form.js b/assets/js/um-jquery-form.js new file mode 100644 index 00000000..591ad6f1 --- /dev/null +++ b/assets/js/um-jquery-form.js @@ -0,0 +1,1277 @@ +/*! + * jQuery Form Plugin + * version: 3.51.0-2014.06.20 + * Requires jQuery v1.5 or later + * Copyright (c) 2014 M. Alsup + * Examples and documentation at: http://malsup.com/jquery/form/ + * Project repository: https://github.com/malsup/form + * Dual licensed under the MIT and GPL licenses. + * https://github.com/malsup/form#copyright-and-license + */ +/*global ActiveXObject */ + +// AMD support +(function (factory) { + "use strict"; + if (typeof define === 'function' && define.amd) { + // using AMD; register as anon module + define(['jquery'], factory); + } else { + // no AMD; invoke directly + factory( (typeof(jQuery) != 'undefined') ? jQuery : window.Zepto ); + } +} + +(function($) { +"use strict"; + +/* + Usage Note: + ----------- + Do not use both ajaxSubmit and ajaxForm on the same form. These + functions are mutually exclusive. Use ajaxSubmit if you want + to bind your own submit handler to the form. For example, + + $(document).ready(function() { + $('#myForm').on('submit', function(e) { + e.preventDefault(); // <-- important + $(this).ajaxSubmit({ + target: '#output' + }); + }); + }); + + Use ajaxForm when you want the plugin to manage all the event binding + for you. For example, + + $(document).ready(function() { + $('#myForm').ajaxForm({ + target: '#output' + }); + }); + + You can also use ajaxForm with delegation (requires jQuery v1.7+), so the + form does not have to exist when you invoke ajaxForm: + + $('#myForm').ajaxForm({ + delegation: true, + target: '#output' + }); + + When using ajaxForm, the ajaxSubmit function will be invoked for you + at the appropriate time. +*/ + +/** + * Feature detection + */ +var feature = {}; +feature.fileapi = $("").get(0).files !== undefined; +feature.formdata = window.FormData !== undefined; + +var hasProp = !!$.fn.prop; + +// attr2 uses prop when it can but checks the return type for +// an expected string. this accounts for the case where a form +// contains inputs with names like "action" or "method"; in those +// cases "prop" returns the element +$.fn.attr2 = function() { + if ( ! hasProp ) { + return this.attr.apply(this, arguments); + } + var val = this.prop.apply(this, arguments); + if ( ( val && val.jquery ) || typeof val === 'string' ) { + return val; + } + return this.attr.apply(this, arguments); +}; + +/** + * ajaxSubmit() provides a mechanism for immediately submitting + * an HTML form using AJAX. + */ +$.fn.ajaxSubmit = function(options) { + /*jshint scripturl:true */ + + // fast fail if nothing selected (http://dev.jquery.com/ticket/2752) + if (!this.length) { + log('ajaxSubmit: skipping submit process - no element selected'); + return this; + } + + var method, action, url, $form = this; + + if (typeof options == 'function') { + options = { success: options }; + } + else if ( options === undefined ) { + options = {}; + } + + method = options.type || this.attr2('method'); + action = options.url || this.attr2('action'); + + url = (typeof action === 'string') ? $.trim(action) : ''; + url = url || window.location.href || ''; + if (url) { + // clean url (don't include hash vaue) + url = (url.match(/^([^#]+)/)||[])[1]; + } + + options = $.extend(true, { + url: url, + success: $.ajaxSettings.success, + type: method || $.ajaxSettings.type, + iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank' + }, options); + + // hook for manipulating the form data before it is extracted; + // convenient for use with rich editors like tinyMCE or FCKEditor + var veto = {}; + this.trigger('form-pre-serialize', [this, options, veto]); + if (veto.veto) { + log('ajaxSubmit: submit vetoed via form-pre-serialize trigger'); + return this; + } + + // provide opportunity to alter form data before it is serialized + if (options.beforeSerialize && options.beforeSerialize(this, options) === false) { + log('ajaxSubmit: submit aborted via beforeSerialize callback'); + return this; + } + + var traditional = options.traditional; + if ( traditional === undefined ) { + traditional = $.ajaxSettings.traditional; + } + + var elements = []; + var qx, a = this.formToArray(options.semantic, elements); + if (options.data) { + options.extraData = options.data; + qx = $.param(options.data, traditional); + } + + // give pre-submit callback an opportunity to abort the submit + if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) { + log('ajaxSubmit: submit aborted via beforeSubmit callback'); + return this; + } + + // fire vetoable 'validate' event + this.trigger('form-submit-validate', [a, this, options, veto]); + if (veto.veto) { + log('ajaxSubmit: submit vetoed via form-submit-validate trigger'); + return this; + } + + var q = $.param(a, traditional); + if (qx) { + q = ( q ? (q + '&' + qx) : qx ); + } + if (options.type.toUpperCase() == 'GET') { + options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q; + options.data = null; // data is null for 'get' + } + else { + options.data = q; // data is the query string for 'post' + } + + var callbacks = []; + if (options.resetForm) { + callbacks.push(function() { $form.resetForm(); }); + } + if (options.clearForm) { + callbacks.push(function() { $form.clearForm(options.includeHidden); }); + } + + // perform a load on the target only if dataType is not provided + if (!options.dataType && options.target) { + var oldSuccess = options.success || function(){}; + callbacks.push(function(data) { + var fn = options.replaceTarget ? 'replaceWith' : 'html'; + $(options.target)[fn](data).each(oldSuccess, arguments); + }); + } + else if (options.success) { + callbacks.push(options.success); + } + + options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg + var context = options.context || this ; // jQuery 1.4+ supports scope context + for (var i=0, max=callbacks.length; i < max; i++) { + callbacks[i].apply(context, [data, status, xhr || $form, $form]); + } + }; + + if (options.error) { + var oldError = options.error; + options.error = function(xhr, status, error) { + var context = options.context || this; + oldError.apply(context, [xhr, status, error, $form]); + }; + } + + if (options.complete) { + var oldComplete = options.complete; + options.complete = function(xhr, status) { + var context = options.context || this; + oldComplete.apply(context, [xhr, status, $form]); + }; + } + + // are there files to upload? + + // [value] (issue #113), also see comment: + // https://github.com/malsup/form/commit/588306aedba1de01388032d5f42a60159eea9228#commitcomment-2180219 + var fileInputs = $('input[type=file]:enabled', this).filter(function() { return $(this).val() !== ''; }); + + var hasFileInputs = fileInputs.length > 0; + var mp = 'multipart/form-data'; + var multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp); + + var fileAPI = feature.fileapi && feature.formdata; + log("fileAPI :" + fileAPI); + var shouldUseFrame = (hasFileInputs || multipart) && !fileAPI; + + var jqxhr; + + // options.iframe allows user to force iframe mode + // 06-NOV-09: now defaulting to iframe mode if file input is detected + if (options.iframe !== false && (options.iframe || shouldUseFrame)) { + // hack to fix Safari hang (thanks to Tim Molendijk for this) + // see: http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d + if (options.closeKeepAlive) { + $.get(options.closeKeepAlive, function() { + jqxhr = fileUploadIframe(a); + }); + } + else { + jqxhr = fileUploadIframe(a); + } + } + else if ((hasFileInputs || multipart) && fileAPI) { + jqxhr = fileUploadXhr(a); + } + else { + jqxhr = $.ajax(options); + } + + $form.removeData('jqxhr').data('jqxhr', jqxhr); + + // clear element array + for (var k=0; k < elements.length; k++) { + elements[k] = null; + } + + // fire 'notify' event + this.trigger('form-submit-notify', [this, options]); + return this; + + // utility fn for deep serialization + function deepSerialize(extraData){ + var serialized = $.param(extraData, options.traditional).split('&'); + var len = serialized.length; + var result = []; + var i, part; + for (i=0; i < len; i++) { + // #252; undo param space replacement + serialized[i] = serialized[i].replace(/\+/g,' '); + part = serialized[i].split('='); + // #278; use array instead of object storage, favoring array serializations + result.push([decodeURIComponent(part[0]), decodeURIComponent(part[1])]); + } + return result; + } + + // XMLHttpRequest Level 2 file uploads (big hat tip to francois2metz) + function fileUploadXhr(a) { + var formdata = new FormData(); + + for (var i=0; i < a.length; i++) { + formdata.append(a[i].name, a[i].value); + } + + if (options.extraData) { + var serializedData = deepSerialize(options.extraData); + for (i=0; i < serializedData.length; i++) { + if (serializedData[i]) { + formdata.append(serializedData[i][0], serializedData[i][1]); + } + } + } + + options.data = null; + + var s = $.extend(true, {}, $.ajaxSettings, options, { + contentType: false, + processData: false, + cache: false, + type: method || 'POST' + }); + + if (options.uploadProgress) { + // workaround because jqXHR does not expose upload property + s.xhr = function() { + var xhr = $.ajaxSettings.xhr(); + if (xhr.upload) { + xhr.upload.addEventListener('progress', function(event) { + var percent = 0; + var position = event.loaded || event.position; /*event.position is deprecated*/ + var total = event.total; + if (event.lengthComputable) { + percent = Math.ceil(position / total * 100); + } + options.uploadProgress(event, position, total, percent); + }, false); + } + return xhr; + }; + } + + s.data = null; + var beforeSend = s.beforeSend; + s.beforeSend = function(xhr, o) { + //Send FormData() provided by user + if (options.formData) { + o.data = options.formData; + } + else { + o.data = formdata; + } + if(beforeSend) { + beforeSend.call(this, xhr, o); + } + }; + return $.ajax(s); + } + + // private function for handling file uploads (hat tip to YAHOO!) + function fileUploadIframe(a) { + var form = $form[0], el, i, s, g, id, $io, io, xhr, sub, n, timedOut, timeoutHandle; + var deferred = $.Deferred(); + + // #341 + deferred.abort = function(status) { + xhr.abort(status); + }; + + if (a) { + // ensure that every serialized input is still enabled + for (i=0; i < elements.length; i++) { + el = $(elements[i]); + if ( hasProp ) { + el.prop('disabled', false); + } + else { + el.removeAttr('disabled'); + } + } + } + + s = $.extend(true, {}, $.ajaxSettings, options); + s.context = s.context || s; + id = 'jqFormIO' + (new Date().getTime()); + if (s.iframeTarget) { + $io = $(s.iframeTarget); + n = $io.attr2('name'); + if (!n) { + $io.attr2('name', id); + } + else { + id = n; + } + } + else { + $io = $('