springup/cmc-sales
2
0
Fork 0
Code Issues 49 Pull requests Actions Packages Projects Releases Wiki Activity

Fairly big changes to the Add-editing of users for the new Enquiry adding methods

Browse source
This commit is contained in:
Karl Cordes 2011-07-04 14:04:52 +10:00
parent 9b63ac06ac
commit 10c14c1958
10 changed files with 657 additions and 438 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
controllers/customers_controller.php
View file

@ -185,6 +185,7 @@ class CustomersController extends AppController {
$contactList[$contact['Contact']['id']] = $contact['Contact']['first_name'].' '.$contact['Contact']['last_name'];
}
$this->set('contacts',$contactList);
}

322
controllers/users_controller.php
View file

@ -1,70 +1,67 @@
<?php
class UsersController extends AppController {
var $name = 'Users';
var $helpers = array('Html', 'Form', 'Javascript', 'Text');
var $components = array('Acl','Auth', 'Cookie');
var $components = array('Acl', 'Auth', 'Cookie');
var $paginate = array(
'limit' => 500,
'order' => 'User.id asc',
'Users' => array('order' => array('User.id' => 'asc'),
),
'Enquiry' => array('order' => array('Enquiry.id' => 'desc'), 'limit' => 250)
'limit' => 500,
'order' => 'User.id asc',
'Users' => array('order' => array('User.id' => 'asc'),
),
'Enquiry' => array('order' => array('Enquiry.id' => 'desc'), 'limit' => 250)
);
function beforeFilter() {
$this->Auth->allow('add');
$this->set('currentuser', $this->Auth->user());
$this->Auth->autoRedirect = false;
//$this->login();
$this->Auth->allow('add');
$this->set('currentuser', $this->Auth->user());
$this->Auth->autoRedirect = false;
//$this->login();
}
function login() { //Provided by the authComponent
$this->pageTitle = ': Login';
//$this->Session->setFlash(__('Please enter your Username and Password to continue', true));
$this->pageTitle = ': Login';
//$this->Session->setFlash(__('Please enter your Username and Password to continue', true));
/* Auth Cookie code from http://www.webdevelopment2.com/cakephp-auth-component-tutorial-3/ */
//– code inside this function will execute only when autoRedirect was set to false (i.e. in a beforeFilter).
if ($this->Auth->user()) {
if (!empty($this->data) && $this->data['User']['remember_me']) {
$cookie = array();
$cookie['username'] = $this->data['User']['username'];
$cookie['password'] = $this->data['User']['password'];
$this->Cookie->write('Auth.User', $cookie, true, '+2 weeks');
unset($this->data['User']['remember_me']);
}
$this->redirect($this->Auth->redirect());
}
if (empty($this->data)) {
$cookie = $this->Cookie->read('Auth.User');
if (!is_null($cookie)) {
if ($this->Auth->login($cookie)) {
// Clear auth message, just in case we use it.
// $this->Session->setFlash(__('Welcome back '.$cookie['username']), true);
$this->Session->del('Message.auth');
$this->redirect($this->Auth->redirect());
} else { // Delete invalid Cookie
$this->Cookie->del('Auth.User');
}
}
}
/* Auth Cookie code from http://www.webdevelopment2.com/cakephp-auth-component-tutorial-3/ */
//– code inside this function will execute only when autoRedirect was set to false (i.e. in a beforeFilter).
if ($this->Auth->user()) {
if (!empty($this->data) && $this->data['User']['remember_me']) {
$cookie = array();
$cookie['username'] = $this->data['User']['username'];
$cookie['password'] = $this->data['User']['password'];
$this->Cookie->write('Auth.User', $cookie, true, '+2 weeks');
unset($this->data['User']['remember_me']);
}
$this->redirect($this->Auth->redirect());
}
if (empty($this->data)) {
$cookie = $this->Cookie->read('Auth.User');
if (!is_null($cookie)) {
if ($this->Auth->login($cookie)) {
// Clear auth message, just in case we use it.
// $this->Session->setFlash(__('Welcome back '.$cookie['username']), true);
$this->Session->del('Message.auth');
$this->redirect($this->Auth->redirect());
} else { // Delete invalid Cookie
$this->Cookie->del('Auth.User');
}
}
}
}
function logout() {
$this->Cookie->del('Auth.User');
$this->redirect($this->Auth->logout());
$this->Cookie->del('Auth.User');
$this->redirect($this->Auth->logout());
}
function index() {
$this->User->recursive = 0;
$this->set('users', $this->paginate());
$this->User->recursive = 0;
$this->set('users', $this->paginate());
}
/**
* View a User.
*
@ -73,176 +70,155 @@ class UsersController extends AppController {
* @param int $id
*/
function view($id = null) {
if (!$id) {
$this->Session->setFlash(__('Invalid User.', true));
$this->redirect(array('action'=>'index'));
}
if (!$id) {
$this->Session->setFlash(__('Invalid User.', true));
$this->redirect(array('action' => 'index'));
}
//$user = $this->User->read(null, $id);
//$user = $this->User->read(null, $id);
$userFields = array('User.id', 'User.principle_id','User.customer_id','User.type',
'User.access_level','User.username','User.first_name','User.last_name',
'User.email','User.job_title','User.phone','User.mobile','User.fax','User.phone_extension','User.direct_phone',
'User.notes','User.by_vault','User.blacklisted'
);
$userFields = array('User.id', 'User.principle_id', 'User.customer_id', 'User.type',
'User.access_level', 'User.username', 'User.first_name', 'User.last_name',
'User.email', 'User.job_title', 'User.phone', 'User.mobile', 'User.fax', 'User.phone_extension', 'User.direct_phone',
'User.notes', 'User.by_vault', 'User.blacklisted'
);
$user = $this->User->find('first', array('conditions'=>array('User.id'=>$id), 'fields'=>$userFields, 'recursive'=>0));
$user = $this->User->find('first', array('conditions' => array('User.id' => $id), 'fields' => $userFields, 'recursive' => 0));
$this->set('user', $user);
$this->set('user', $user);
/*$emailIDs = array();
foreach($user['Email'] as $email) {
$emailIDs[] = $email['id'];
}
$emails = $this->User->Email->find('all', array('conditions'=>array('Email.id'=>$emailIDs)));
$this->set('emails', $emails);
/*/
/* $emailIDs = array();
foreach($user['Email'] as $email) {
$emailIDs[] = $email['id'];
}
$emails = $this->User->Email->find('all', array('conditions'=>array('Email.id'=>$emailIDs)));
$this->set('emails', $emails);
/ */
switch($user['User']['type']) {
case 'contact':
switch ($user['User']['type']) {
case 'contact':
if(isset($user['User']['customer_id'])) {
$this->set('customer', $this->User->Customer->find('first',array('conditions'=>array('Customer.id'=>$user['User']['customer_id']), 'recursive'=>0)));
}
$this->render('viewContact');
break;
if (isset($user['User']['customer_id'])) {
$this->set('customer', $this->User->Customer->find('first', array('conditions' => array('Customer.id' => $user['User']['customer_id']), 'recursive' => 0)));
}
$this->render('viewContact');
break;
case 'principle':
case 'principle':
$this->render('viewPrinciple');
break;
$this->render('viewPrinciple');
break;
case 'user':
//$this->set('enquiries', $this->paginate('Enquiry', array('Enquiry.user_id' => $id)));
case 'user':
//$this->set('enquiries', $this->paginate('Enquiry', array('Enquiry.user_id' => $id)));
$this->render('viewUser');
$this->render('viewUser');
break;
default:
break;
}
break;
default:
break;
}
}
function add_edit() {
Configure::write('debug', 0);
Configure::write('debug', 0);
if(isset($this->params['named']['type'])) {
$this->set('type', $this->params['named']['type']);
}
if (isset($this->params['named']['type'])) {
$this->set('type', $this->params['named']['type']);
}
if(isset($this->params['named']['principle_id'])) {
$this->set('principle_id', $this->params['named']['principle_id']);
}
if(isset($this->params['named']['customer_id'])) {
$this->set('customer_id', $this->params['named']['customer_id']);
}
if(isset($this->params['named']['user_id'])) {
$userID = $this->params['named']['user_id'];
$this->set('user_id', $userID);
}
if(isset($this->params['named']['action'])) {
$action = $this->params['named']['action'];
$this->set('action', $action);
}
if(isset($action) && isset($userID)) {
$this->data = $this->User->read(null, $userID);
}
if (isset($this->params['named']['principle_id'])) {
$this->set('principle_id', $this->params['named']['principle_id']);
}
if (isset($this->params['named']['customer_id'])) {
$this->set('customer_id', $this->params['named']['customer_id']);
}
if (isset($this->params['named']['user_id'])) {
$userID = $this->params['named']['user_id'];
$this->set('user_id', $userID);
}
if (isset($this->params['named']['action'])) {
$action = $this->params['named']['action'];
$this->set('action', $action);
}
if (isset($action) && isset($userID)) {
$this->data = $this->User->read(null, $userID);
}
}
function add_user() {
Configure::write('debug', 0);
$this->layout = 'ajax';
if (!empty($this->data)) {
$this->User->create();
$this->User->set($this->data['User']);
if($this->User->validates()) {
if ($this->User->save($this->data)) {
$message = __('The User has been saved.', true);
$data = $this->data;
$this->set('success', compact('message', 'data'));
}
}
else {
$message = __('The User could not be saved. Please, try again.', true);
$User = $this->User->invalidFields();
$data = compact('User');
$this->set('errors', compact('message', 'data'));
}
Configure::write('debug', 0);
$this->layout = 'ajax';
if (!empty($this->data)) {
$this->User->create();
$this->User->set($this->data['User']);
}
if ($this->User->save($this->data)) {
$message = __('The User has been saved.', true);
$data = $this->data;
$this->set('status', array('status'=>'success'));
} else {
$message = __('The User could not be saved.', true);
$this->set('status', array('status'=>'failure'));
}
}
}
/*if (!empty($this->data)) {
$this->User->create();
if ($this->User->save($this->data)) {
$this->Session->setFlash(__('The User has been saved', true));
$this->redirect(array('action'=>'index'));
} else {
$this->Session->setFlash(__('The User could not be saved. Please, try again.', true));
}
}
}*/
/* if (!empty($this->data)) {
$this->User->create();
if ($this->User->save($this->data)) {
$this->Session->setFlash(__('The User has been saved', true));
$this->redirect(array('action'=>'index'));
} else {
$this->Session->setFlash(__('The User could not be saved. Please, try again.', true));
}
}
} */
/**
* the default generated add() method. Used for system users, rather than contacts & principle contacts.
*/
function add() {
if (!empty($this->data)) {
$this->User->create();
if ($this->User->save($this->data)) {
$this->Session->setFlash(__('The User has been saved', true));
$this->redirect(array('action'=>'index'));
} else {
$this->Session->setFlash(__('The User could not be saved. Please, try again.', true));
}
}
if (!empty($this->data)) {
$this->User->create();
if ($this->User->save($this->data)) {
$this->Session->setFlash(__('The User has been saved', true));
$this->redirect(array('action' => 'index'));
} else {
$this->Session->setFlash(__('The User could not be saved. Please, try again.', true));
}
}
}
function edit($id = null) {
if (!$id && empty($this->data)) {
$this->Session->setFlash(__('Invalid User', true));
$this->redirect(array('action'=>'index'));
}
if (!empty($this->data)) {
if ($this->User->save($this->data)) {
$this->Session->setFlash(__('The User has been saved', true));
$this->redirect(array('action'=>'index'));
} else {
$this->Session->setFlash(__('The User could not be saved. Please, try again.', true));
}
}
if (empty($this->data)) {
$this->data = $this->User->read(null, $id);
}
if (!$id && empty($this->data)) {
$this->Session->setFlash(__('Invalid User', true));
$this->redirect(array('action' => 'index'));
}
if (!empty($this->data)) {
if ($this->User->save($this->data)) {
$this->Session->setFlash(__('The User has been saved', true));
$this->redirect(array('action' => 'index'));
} else {
$this->Session->setFlash(__('The User could not be saved. Please, try again.', true));
}
}
if (empty($this->data)) {
$this->data = $this->User->read(null, $id);
}
}
}
?>

16
views/customers/customer_contacts.ctp
View file

@ -1,5 +1,19 @@
<script type="text/javascript">
$(function() {
$("#addContactUser").button();
});
</script>
<?
echo $form->radio('Enquiry.contact_id', $contacts, array('legend'=>'Choose Contact'));
?>
?>
<button id="addContactUser">Add New Contact</button>
<? echo $javascript->link('add_edit_user'); ?>
<div id="addUserDiv">
</div>

1
views/enquiries/add.ctp
View file

@ -6,6 +6,7 @@
<legend><?php __("New Enquiry");?></legend>
<div class="customer_id" id="" style="display: none;"></div>
<?php
$customerInstructions = '<div class="instructions">Start typing then select the Customer from the list</div>';

1
views/layouts/default.ctp
View file

@ -34,6 +34,7 @@
echo $javascript->link('search');
echo $javascript->link('jquery.jeditable.mini');
//echo $javascript->link('ckeditor/adapters/jquery');
echo $javascript->link('jquery.validate');
echo $scripts_for_layout;
?>

122
views/users/add_edit.ctp
View file

@ -1,58 +1,80 @@
<?=$javascript->link('add_edit_user_ajax');?>
<div class="users form">
<?php echo $form->create('User',array('action'=>'add_user'));?>
<?php
echo $form->input('first_name');
echo $form->input('last_name');
echo $form->input('email');
echo $form->input('job_title');
echo $form->input('phone');
echo $form->input('phone_extension');
echo $form->input('mobile');
echo $form->input('fax');
echo $form->input('direct_phone');
echo $form->input('notes');
<script type="text/javascript">
$(function() {
$("#UserAddUserForm").validate();
$("#submitUserButton").button();
$("#UserAddUserForm").ajaxForm({
dataType: 'json',
// success identifies the function to invoke when the server response
// has been received
success: processJson
});
function processJson(data) {
if(data.status == 'success') {
}
else {
alert("Error while adding this Contact");
}
}
});
</script>
switch($type) {
case 'contact':
echo $form->input('customer_id', array('type'=>'hidden', 'value'=>$customer_id));
echo $form->input('type', array('type'=>'hidden', 'value'=>'contact'));
$buttonStr = 'Contact';
break;
case 'principle':
echo $form->input('principle_id', array('type'=>'hidden', 'value'=>$principle_id));
$buttonStr = 'Principle Contact';
case 'user':
$buttonStr = 'User';
break;
default:
break;
}
switch($action) {
case 'add':
$actionStr = 'Add';
break;
case 'edit':
$actionStr ='Edit';
echo $form->input('id', array('type'=>'hidden', 'value'=>$user_id));
break;
<?php echo $form->create('User', array('action' => 'add_user')); ?>
}
<?php
echo $form->input('first_name', array('class' => 'required'));
echo $form->input('last_name', array('class' => ''));
echo $form->input('email', array('class' => 'email'));
echo $form->input('job_title');
echo $form->input('phone');
echo $form->input('phone_extension');
echo $form->input('mobile');
echo $form->input('fax');
echo $form->input('direct_phone');
echo $form->input('notes');
echo $form->submit($actionStr.' '.$buttonStr, array('id'=>'submitUserButton'));
switch ($type) {
case 'contact':
echo $form->input('customer_id', array('type' => 'hidden', 'value' => $customer_id));
echo $form->input('type', array('type' => 'hidden', 'value' => 'contact'));
$buttonStr = 'Contact';
break;
case 'principle':
echo $form->input('principle_id', array('type' => 'hidden', 'value' => $principle_id));
$buttonStr = 'Principle Contact';
case 'user':
$buttonStr = 'User';
break;
default:
break;
}
switch ($action) {
case 'add':
$actionStr = 'Add';
break;
case 'edit':
$actionStr = 'Edit';
echo $form->input('id', array('type' => 'hidden', 'value' => $user_id));
break;
}
?>
</div>
echo $form->submit($actionStr . ' ' . $buttonStr, array('id' => 'submitUserButton'));
?>

28
views/users/add_user.ctp
View file

@ -1,29 +1,3 @@
<?php
$output = array();
if($this->validationErrors) {
$output = Set::insert($output, 'errors', array('message' => $errors['message']));
$errorMessages = array(
'Post' => array(
'title' => array(
'required' => __("This field cannot be left blank.", true),
'maxlength' => sprintf(__("Maximum length of %d characters.", true), 30)
),
'body' => array(
'required' => __("This field cannot be left blank.", true),
'maxlength' => sprintf(__("Maximum length of %d characters.", true), 200)
)
)
);
foreach ($errors['data'] as $model => $errs) {
foreach ($errs as $field => $message) {
$output['errors']['data'][$model][$field] = $errorMessages[$model][$field][$message];
}
}
} elseif ($success) {
$output = Set::insert($output, 'success', array(
'message' => $success['message'],
'data' => $success['data']
));
}
echo $javascript->object($output);
echo $javascript->object($status);
?>

16
webroot/css/quotenik.css
View file

@ -1164,22 +1164,6 @@ div.commercialComments {
}
form.cmxform fieldset {
margin-bottom: 10px;
}
form.cmxform legend {
padding: 0 2px;
font-weight: bold;
font-size: 140%;
}
form.cmxform label {
float: left;
display: inline-block;
width: 15em;
position: relative;
}
label span.rightHandLabel {
position: relative;
display: inline-block;

6
webroot/js/add_edit_user.js
View file

@ -30,12 +30,12 @@ $(function() {
//The diaglog box for Adding a contact.
$("#addUserDiv").dialog({
autoOpen: false,
width: 450,
width: 300,
modal: true,
position: 'top'
});
$("#addContactUser").click(function() { //Adding a Contact to a Customer.
$("#addContactUser").live('click', function() { //Adding a Contact to a Customer.
var userType = 'contact';
var customer_id = $('.customer_id').attr('id');
var thisAction = 'add'
@ -46,6 +46,8 @@ $(function() {
return false;
});
$("#addPrincipleUser").click(function() {
var userType = 'principle';
var customer_id = $('.principle_id').attr('id');

582
webroot/js/jquery.form.js Executable file → Normal file
View file

@ -1,6 +1,6 @@
/*
/*!
* jQuery Form Plugin
* version: 2.38 (13-FEB-2010)
* version: 2.82 (15-JUN-2011)
* @requires jQuery v1.3.2 or later
*
* Examples and documentation at: http://malsup.com/jquery/form/
@ -18,11 +18,11 @@
to bind your own submit handler to the form. For example,
$(document).ready(function() {
$('#myForm').bind('submit', function() {
$('#myForm').bind('submit', function(e) {
e.preventDefault(); // <-- important
$(this).ajaxSubmit({
target: '#output'
});
return false; // <-- important!
});
});
@ -49,22 +49,28 @@ $.fn.ajaxSubmit = function(options) {
log('ajaxSubmit: skipping submit process - no element selected');
return this;
}
var method, action, url, $form = this;;
if (typeof options == 'function')
if (typeof options == 'function') {
options = { success: options };
}
var url = $.trim(this.attr('action'));
method = this.attr('method');
action = this.attr('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];
}
url = url || window.location.href || '';
}
options = $.extend({
options = $.extend(true, {
url: url,
type: this.attr('method') || 'GET',
success: $.ajaxSettings.success,
type: method || 'GET',
iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
}, options || {});
}, options);
// hook for manipulating the form data before it is extracted;
// convenient for use with rich editors like tinyMCE or FCKEditor
@ -81,16 +87,20 @@ $.fn.ajaxSubmit = function(options) {
return this;
}
var a = this.formToArray(options.semantic);
var n,v,a = this.formToArray(options.semantic);
if (options.data) {
options.extraData = options.data;
for (var n in options.data) {
if(options.data[n] instanceof Array) {
for (var k in options.data[n])
a.push( { name: n, value: options.data[n][k] } );
}
else
a.push( { name: n, value: options.data[n] } );
for (n in options.data) {
if(options.data[n] instanceof Array) {
for (var k in options.data[n]) {
a.push( { name: n, value: options.data[n][k] } );
}
}
else {
v = options.data[n];
v = $.isFunction(v) ? v() : v; // if value is fn, invoke it
a.push( { name: n, value: v } );
}
}
}
@ -113,51 +123,63 @@ $.fn.ajaxSubmit = function(options) {
options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
options.data = null; // data is null for 'get'
}
else
else {
options.data = q; // data is the query string for 'post'
}
var $form = this, callbacks = [];
if (options.resetForm) callbacks.push(function() { $form.resetForm(); });
if (options.clearForm) callbacks.push(function() { $form.clearForm(); });
var callbacks = [];
if (options.resetForm) {
callbacks.push(function() { $form.resetForm(); });
}
if (options.clearForm) {
callbacks.push(function() { $form.clearForm(); });
}
// 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) {
$(options.target).html(data).each(oldSuccess, arguments);
var fn = options.replaceTarget ? 'replaceWith' : 'html';
$(options.target)[fn](data).each(oldSuccess, arguments);
});
}
else if (options.success)
else if (options.success) {
callbacks.push(options.success);
}
options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
for (var i=0, max=callbacks.length; i < max; i++)
callbacks[i].apply(options, [data, status, xhr || $form, $form]);
var context = options.context || options; // 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]);
}
};
// are there files to upload?
var files = $('input:file', this).fieldValue();
var found = false;
for (var j=0; j < files.length; j++)
if (files[j])
found = true;
var multipart = false;
// var mp = 'multipart/form-data';
// multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
var fileInputs = $('input:file', this).length > 0;
var mp = 'multipart/form-data';
var multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
// options.iframe allows user to force iframe mode
// 06-NOV-09: now defaulting to iframe mode if file input is detected
if ((files.length && options.iframe !== false) || options.iframe || found || multipart) {
if (options.iframe !== false && (fileInputs || options.iframe || multipart)) {
// 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, fileUpload);
else
fileUpload();
}
else
$.ajax(options);
if (options.closeKeepAlive) {
$.get(options.closeKeepAlive, function() { fileUpload(a); });
}
else {
fileUpload(a);
}
}
else {
// IE7 massage (see issue 57)
if ($.browser.msie && method == 'get') {
var ieMeth = $form[0].getAttribute('method');
if (typeof ieMeth === 'string')
options.type = ieMeth;
}
$.ajax(options);
}
// fire 'notify' event
this.trigger('form-submit-notify', [this, options]);
@ -165,24 +187,42 @@ $.fn.ajaxSubmit = function(options) {
// private function for handling file uploads (hat tip to YAHOO!)
function fileUpload() {
var form = $form[0];
function fileUpload(a) {
var form = $form[0], i, s, g, id, $io, io, xhr, sub, n, timedOut, timeoutHandle;
if ($(':input[name=submit]', form).length) {
alert('Error: Form elements must not be named "submit".');
if (a) {
// ensure that every serialized input is still enabled
for (i=0; i < a.length; i++) {
$(form[a[i].name]).attr('disabled', false);
}
}
if ($(':input[name=submit],:input[id=submit]', form).length) {
// if there is an input with a name or id of 'submit' then we won't be
// able to invoke the submit fn on the form (at least not x-browser)
alert('Error: Form elements must not have name or id of "submit".');
return;
}
s = $.extend(true, {}, $.ajaxSettings, options);
s.context = s.context || s;
id = 'jqFormIO' + (new Date().getTime());
if (s.iframeTarget) {
$io = $(s.iframeTarget);
n = $io.attr('name');
if (n == null)
$io.attr('name', id);
else
id = n;
}
else {
$io = $('<iframe name="' + id + '" src="'+ s.iframeSrc +'" />');
$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
}
io = $io[0];
var opts = $.extend({}, $.ajaxSettings, options);
var s = $.extend(true, {}, $.extend(true, {}, $.ajaxSettings), opts);
var id = 'jqFormIO' + (new Date().getTime());
var $io = $('<iframe id="' + id + '" name="' + id + '" src="'+ opts.iframeSrc +'" />');
var io = $io[0];
$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
var xhr = { // mock object
xhr = { // mock object
aborted: 0,
responseText: null,
responseXML: null,
@ -191,41 +231,59 @@ $.fn.ajaxSubmit = function(options) {
getAllResponseHeaders: function() {},
getResponseHeader: function() {},
setRequestHeader: function() {},
abort: function() {
abort: function(status) {
var e = (status === 'timeout' ? 'timeout' : 'aborted');
log('aborting upload... ' + e);
this.aborted = 1;
$io.attr('src', opts.iframeSrc); // abort op in progress
$io.attr('src', s.iframeSrc); // abort op in progress
xhr.error = e;
s.error && s.error.call(s.context, xhr, e, status);
g && $.event.trigger("ajaxError", [xhr, s, e]);
s.complete && s.complete.call(s.context, xhr, e);
}
};
var g = opts.global;
g = s.global;
// trigger ajax global events so that activity/block indicators work like normal
if (g && ! $.active++) $.event.trigger("ajaxStart");
if (g) $.event.trigger("ajaxSend", [xhr, opts]);
if (g && ! $.active++) {
$.event.trigger("ajaxStart");
}
if (g) {
$.event.trigger("ajaxSend", [xhr, s]);
}
if (s.beforeSend && s.beforeSend(xhr, s) === false) {
s.global && $.active--;
if (s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false) {
if (s.global) {
$.active--;
}
return;
}
if (xhr.aborted)
if (xhr.aborted) {
return;
var cbInvoked = 0;
var timedOut = 0;
}
// add submitting element to data if we know it
var sub = form.clk;
sub = form.clk;
if (sub) {
var n = sub.name;
n = sub.name;
if (n && !sub.disabled) {
opts.extraData = opts.extraData || {};
opts.extraData[n] = sub.value;
s.extraData = s.extraData || {};
s.extraData[n] = sub.value;
if (sub.type == "image") {
opts.extraData[name+'.x'] = form.clk_x;
opts.extraData[name+'.y'] = form.clk_y;
s.extraData[n+'.x'] = form.clk_x;
s.extraData[n+'.y'] = form.clk_y;
}
}
}
var CLIENT_TIMEOUT_ABORT = 1;
var SERVER_ABORT = 2;
function getDoc(frame) {
var doc = frame.contentWindow ? frame.contentWindow.document : frame.contentDocument ? frame.contentDocument : frame.document;
return doc;
}
// take a breath so that pending repaints get some cpu time before the upload starts
function doSubmit() {
// make sure form attrs are set
@ -233,13 +291,15 @@ $.fn.ajaxSubmit = function(options) {
// update form attrs in IE friendly way
form.setAttribute('target',id);
if (form.getAttribute('method') != 'POST')
if (!method) {
form.setAttribute('method', 'POST');
if (form.getAttribute('action') != opts.url)
form.setAttribute('action', opts.url);
}
if (a != s.url) {
form.setAttribute('action', s.url);
}
// ie borks in some cases when setting encoding
if (! opts.skipEncodingOverride) {
if (! s.skipEncodingOverride && (!method || /post/i.test(method))) {
$form.attr({
encoding: 'multipart/form-data',
enctype: 'multipart/form-data'
@ -247,121 +307,249 @@ $.fn.ajaxSubmit = function(options) {
}
// support timout
if (opts.timeout)
setTimeout(function() { timedOut = true; cb(); }, opts.timeout);
if (s.timeout) {
timeoutHandle = setTimeout(function() { timedOut = true; cb(CLIENT_TIMEOUT_ABORT); }, s.timeout);
}
// look for server aborts
function checkState() {
try {
var state = getDoc(io).readyState;
log('state = ' + state);
if (state.toLowerCase() == 'uninitialized')
setTimeout(checkState,50);
}
catch(e) {
log('Server abort: ' , e, ' (', e.name, ')');
cb(SERVER_ABORT);
timeoutHandle && clearTimeout(timeoutHandle);
timeoutHandle = undefined;
}
}
// add "extra" data to form if provided in options
var extraInputs = [];
try {
if (opts.extraData)
for (var n in opts.extraData)
if (s.extraData) {
for (var n in s.extraData) {
extraInputs.push(
$('<input type="hidden" name="'+n+'" value="'+opts.extraData[n]+'" />')
$('<input type="hidden" name="'+n+'" />').attr('value',s.extraData[n])
.appendTo(form)[0]);
}
}
// add iframe to doc and submit the form
$io.appendTo('body');
io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
if (!s.iframeTarget) {
// add iframe to doc and submit the form
$io.appendTo('body');
io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
}
setTimeout(checkState,15);
form.submit();
}
finally {
// reset attrs and remove "extra" input elements
form.setAttribute('action',a);
t ? form.setAttribute('target', t) : $form.removeAttr('target');
if(t) {
form.setAttribute('target', t);
} else {
$form.removeAttr('target');
}
$(extraInputs).remove();
}
};
}
if (opts.forceSync)
if (s.forceSync) {
doSubmit();
else
}
else {
setTimeout(doSubmit, 10); // this lets dom updates render
var domCheckCount = 50;
}
function cb() {
if (cbInvoked++) return;
var data, doc, domCheckCount = 50, callbackProcessed;
io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
var ok = true;
function cb(e) {
if (xhr.aborted || callbackProcessed) {
return;
}
try {
if (timedOut) throw 'timeout';
// extract the server response from the iframe
var data, doc;
doc = getDoc(io);
}
catch(ex) {
log('cannot access response document: ', ex);
e = SERVER_ABORT;
}
if (e === CLIENT_TIMEOUT_ABORT && xhr) {
xhr.abort('timeout');
return;
}
else if (e == SERVER_ABORT && xhr) {
xhr.abort('server abort');
return;
}
doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
var isXml = opts.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
if (!doc || doc.location.href == s.iframeSrc) {
// response not received yet
if (!timedOut)
return;
}
io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
var status = 'success', errMsg;
try {
if (timedOut) {
throw 'timeout';
}
var isXml = s.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
log('isXml='+isXml);
if (!isXml && (doc.body == null || doc.body.innerHTML == '')) {
if (--domCheckCount) {
if (!isXml && window.opera && (doc.body == null || doc.body.innerHTML == '')) {
if (--domCheckCount) {
// in some browsers (Opera) the iframe DOM is not always traversable when
// the onload callback fires, so we loop a bit to accommodate
cbInvoked = 0;
setTimeout(cb, 100);
log('requeing onLoad callback, DOM not available');
setTimeout(cb, 250);
return;
}
log('Could not access iframe DOM after 50 tries.');
return;
// let this fall through because server response could be an empty document
//log('Could not access iframe DOM after mutiple tries.');
//throw 'DOMException: not available';
}
xhr.responseText = doc.body ? doc.body.innerHTML : null;
//log('response detected');
var docRoot = doc.body ? doc.body : doc.documentElement;
xhr.responseText = docRoot ? docRoot.innerHTML : null;
xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
if (isXml)
s.dataType = 'xml';
xhr.getResponseHeader = function(header){
var headers = {'content-type': opts.dataType};
var headers = {'content-type': s.dataType};
return headers[header];
};
// support for XHR 'status' & 'statusText' emulation :
if (docRoot) {
xhr.status = Number( docRoot.getAttribute('status') ) || xhr.status;
xhr.statusText = docRoot.getAttribute('statusText') || xhr.statusText;
}
if (opts.dataType == 'json' || opts.dataType == 'script') {
var dt = s.dataType || '';
var scr = /(json|script|text)/.test(dt.toLowerCase());
if (scr || s.textarea) {
// see if user embedded response in textarea
var ta = doc.getElementsByTagName('textarea')[0];
if (ta)
if (ta) {
xhr.responseText = ta.value;
else {
// support for XHR 'status' & 'statusText' emulation :
xhr.status = Number( ta.getAttribute('status') ) || xhr.status;
xhr.statusText = ta.getAttribute('statusText') || xhr.statusText;
}
else if (scr) {
// account for browsers injecting pre around json response
var pre = doc.getElementsByTagName('pre')[0];
if (pre)
xhr.responseText = pre.innerHTML;
}
var b = doc.getElementsByTagName('body')[0];
if (pre) {
xhr.responseText = pre.textContent ? pre.textContent : pre.innerHTML;
}
else if (b) {
xhr.responseText = b.innerHTML;
}
}
}
else if (opts.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
else if (s.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
xhr.responseXML = toXml(xhr.responseText);
}
data = $.httpData(xhr, opts.dataType);
try {
data = httpData(xhr, s.dataType, s);
}
catch (e) {
status = 'parsererror';
xhr.error = errMsg = (e || status);
}
}
catch(e){
ok = false;
$.handleError(opts, xhr, 'error', e);
catch (e) {
log('error caught: ',e);
status = 'error';
xhr.error = errMsg = (e || status);
}
// ordering of these callbacks/triggers is odd, but that's how $.ajax does it
if (ok) {
opts.success(data, 'success');
if (g) $.event.trigger("ajaxSuccess", [xhr, opts]);
if (xhr.aborted) {
log('upload aborted');
status = null;
}
if (g) $.event.trigger("ajaxComplete", [xhr, opts]);
if (g && ! --$.active) $.event.trigger("ajaxStop");
if (opts.complete) opts.complete(xhr, ok ? 'success' : 'error');
if (xhr.status) { // we've set xhr.status
status = (xhr.status >= 200 && xhr.status < 300 || xhr.status === 304) ? 'success' : 'error';
}
// ordering of these callbacks/triggers is odd, but that's how $.ajax does it
if (status === 'success') {
s.success && s.success.call(s.context, data, 'success', xhr);
g && $.event.trigger("ajaxSuccess", [xhr, s]);
}
else if (status) {
if (errMsg == undefined)
errMsg = xhr.statusText;
s.error && s.error.call(s.context, xhr, status, errMsg);
g && $.event.trigger("ajaxError", [xhr, s, errMsg]);
}
g && $.event.trigger("ajaxComplete", [xhr, s]);
if (g && ! --$.active) {
$.event.trigger("ajaxStop");
}
s.complete && s.complete.call(s.context, xhr, status);
callbackProcessed = true;
if (s.timeout)
clearTimeout(timeoutHandle);
// clean up
setTimeout(function() {
$io.remove();
if (!s.iframeTarget)
$io.remove();
xhr.responseXML = null;
}, 100);
};
}
function toXml(s, doc) {
var toXml = $.parseXML || function(s, doc) { // use parseXML if available (jQuery 1.5+)
if (window.ActiveXObject) {
doc = new ActiveXObject('Microsoft.XMLDOM');
doc.async = 'false';
doc.loadXML(s);
}
else
else {
doc = (new DOMParser()).parseFromString(s, 'text/xml');
return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;
}
return (doc && doc.documentElement && doc.documentElement.nodeName != 'parsererror') ? doc : null;
};
};
var parseJSON = $.parseJSON || function(s) {
return window['eval']('(' + s + ')');
};
var httpData = function( xhr, type, s ) { // mostly lifted from jq1.4.4
var ct = xhr.getResponseHeader('content-type') || '',
xml = type === 'xml' || !type && ct.indexOf('xml') >= 0,
data = xml ? xhr.responseXML : xhr.responseText;
if (xml && data.documentElement.nodeName === 'parsererror') {
$.error && $.error('parsererror');
}
if (s && s.dataFilter) {
data = s.dataFilter(data, type);
}
if (typeof data === 'string') {
if (type === 'json' || !type && ct.indexOf('json') >= 0) {
data = parseJSON(data);
} else if (type === "script" || !type && ct.indexOf("javascript") >= 0) {
$.globalEval(data);
}
}
return data;
};
}
};
/**
@ -380,17 +568,35 @@ $.fn.ajaxSubmit = function(options) {
* the form itself.
*/
$.fn.ajaxForm = function(options) {
return this.ajaxFormUnbind().bind('submit.form-plugin', function() {
$(this).ajaxSubmit(options);
return false;
// in jQuery 1.3+ we can fix mistakes with the ready state
if (this.length === 0) {
var o = { s: this.selector, c: this.context };
if (!$.isReady && o.s) {
log('DOM not ready, queuing ajaxForm');
$(function() {
$(o.s,o.c).ajaxForm(options);
});
return this;
}
// is your DOM ready? http://docs.jquery.com/Tutorials:Introducing_$(document).ready()
log('terminating; zero elements found by selector' + ($.isReady ? '' : ' (DOM not ready)'));
return this;
}
return this.ajaxFormUnbind().bind('submit.form-plugin', function(e) {
if (!e.isDefaultPrevented()) { // if event has been canceled, don't proceed
e.preventDefault();
$(this).ajaxSubmit(options);
}
}).bind('click.form-plugin', function(e) {
var target = e.target;
var $el = $(target);
if (!($el.is(":submit,input:image"))) {
// is this a child element of the submit el? (ex: a span within a button)
var t = $el.closest(':submit');
if (t.length == 0)
if (t.length == 0) {
return;
}
target = t[0];
}
var form = this;
@ -431,15 +637,23 @@ $.fn.ajaxFormUnbind = function() {
*/
$.fn.formToArray = function(semantic) {
var a = [];
if (this.length == 0) return a;
if (this.length === 0) {
return a;
}
var form = this[0];
var els = semantic ? form.getElementsByTagName('*') : form.elements;
if (!els) return a;
for(var i=0, max=els.length; i < max; i++) {
var el = els[i];
var n = el.name;
if (!n) continue;
if (!els) {
return a;
}
var i,j,n,v,el,max,jmax;
for(i=0, max=els.length; i < max; i++) {
el = els[i];
n = el.name;
if (!n) {
continue;
}
if (semantic && form.clk && el.type == "image") {
// handle image inputs on the fly when semantic == true
@ -450,18 +664,21 @@ $.fn.formToArray = function(semantic) {
continue;
}
var v = $.fieldValue(el, true);
v = $.fieldValue(el, true);
if (v && v.constructor == Array) {
for(var j=0, jmax=v.length; j < jmax; j++)
for(j=0, jmax=v.length; j < jmax; j++) {
a.push({name: n, value: v[j]});
}
}
else if (v !== null && typeof v != 'undefined')
else if (v !== null && typeof v != 'undefined') {
a.push({name: n, value: v});
}
}
if (!semantic && form.clk) {
// input type=='image' are not found in elements array! handle it here
var $input = $(form.clk), input = $input[0], n = input.name;
var $input = $(form.clk), input = $input[0];
n = input.name;
if (n && !input.disabled && input.type == 'image') {
a.push({name: n, value: $input.val()});
a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
@ -487,14 +704,18 @@ $.fn.fieldSerialize = function(successful) {
var a = [];
this.each(function() {
var n = this.name;
if (!n) return;
if (!n) {
return;
}
var v = $.fieldValue(this, successful);
if (v && v.constructor == Array) {
for (var i=0,max=v.length; i < max; i++)
for (var i=0,max=v.length; i < max; i++) {
a.push({name: n, value: v[i]});
}
}
else if (v !== null && typeof v != 'undefined')
else if (v !== null && typeof v != 'undefined') {
a.push({name: this.name, value: v});
}
});
//hand off to jQuery.param for proper encoding
return $.param(a);
@ -542,8 +763,9 @@ $.fn.fieldValue = function(successful) {
for (var val=[], i=0, max=this.length; i < max; i++) {
var el = this[i];
var v = $.fieldValue(el, successful);
if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length))
if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length)) {
continue;
}
v.constructor == Array ? $.merge(val, v) : val.push(v);
}
return val;
@ -554,17 +776,22 @@ $.fn.fieldValue = function(successful) {
*/
$.fieldValue = function(el, successful) {
var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
if (typeof successful == 'undefined') successful = true;
if (successful === undefined) {
successful = true;
}
if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
(t == 'checkbox' || t == 'radio') && !el.checked ||
(t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
tag == 'select' && el.selectedIndex == -1))
tag == 'select' && el.selectedIndex == -1)) {
return null;
}
if (tag == 'select') {
var index = el.selectedIndex;
if (index < 0) return null;
if (index < 0) {
return null;
}
var a = [], ops = el.options;
var one = (t == 'select-one');
var max = (one ? index+1 : ops.length);
@ -572,15 +799,18 @@ $.fieldValue = function(el, successful) {
var op = ops[i];
if (op.selected) {
var v = op.value;
if (!v) // extra pain for IE...
if (!v) { // extra pain for IE...
v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
if (one) return v;
}
if (one) {
return v;
}
a.push(v);
}
}
return a;
}
return el.value;
return $(el).val();
};
/**
@ -601,14 +831,18 @@ $.fn.clearForm = function() {
* Clears the selected form elements.
*/
$.fn.clearFields = $.fn.clearInputs = function() {
var re = /^(?:color|date|datetime|email|month|number|password|range|search|tel|text|time|url|week)$/i; // 'hidden' is not in this list
return this.each(function() {
var t = this.type, tag = this.tagName.toLowerCase();
if (t == 'text' || t == 'password' || tag == 'textarea')
if (re.test(t) || tag == 'textarea') {
this.value = '';
else if (t == 'checkbox' || t == 'radio')
}
else if (t == 'checkbox' || t == 'radio') {
this.checked = false;
else if (tag == 'select')
}
else if (tag == 'select') {
this.selectedIndex = -1;
}
});
};
@ -619,8 +853,9 @@ $.fn.resetForm = function() {
return this.each(function() {
// guard against an input with the name of 'reset'
// note that IE reports the reset function as an 'object'
if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType))
if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType)) {
this.reset();
}
});
};
@ -628,7 +863,9 @@ $.fn.resetForm = function() {
* Enables or disables any matching elements.
*/
$.fn.enable = function(b) {
if (b == undefined) b = true;
if (b === undefined) {
b = true;
}
return this.each(function() {
this.disabled = !b;
});
@ -639,11 +876,14 @@ $.fn.enable = function(b) {
* selects/deselects and matching option elements.
*/
$.fn.selected = function(select) {
if (select == undefined) select = true;
if (select === undefined) {
select = true;
}
return this.each(function() {
var t = this.type;
if (t == 'checkbox' || t == 'radio')
if (t == 'checkbox' || t == 'radio') {
this.checked = select;
}
else if (this.tagName.toLowerCase() == 'option') {
var $sel = $(this).parent('select');
if (select && $sel[0] && $sel[0].type == 'select-one') {
@ -656,10 +896,14 @@ $.fn.selected = function(select) {
};
// helper fn for console logging
// set $.fn.ajaxSubmit.debug to true to enable debug logging
function log() {
if ($.fn.ajaxSubmit.debug && window.console && window.console.log)
window.console.log('[jquery.form] ' + Array.prototype.join.call(arguments,''));
var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
if (window.console && window.console.log) {
window.console.log(msg);
}
else if (window.opera && window.opera.postError) {
window.opera.postError(msg);
}
};
})(jQuery);