From b0f2ff6302f0d781d7f59ceaafaa607328f0b807 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 8 Dec 2020 10:21:55 -0500 Subject: [PATCH 01/53] Add Session cleaning --- scripts/zmstats.pl.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/zmstats.pl.in b/scripts/zmstats.pl.in index 8aef4ddc6..81fdd3129 100644 --- a/scripts/zmstats.pl.in +++ b/scripts/zmstats.pl.in @@ -91,6 +91,9 @@ while( 1 ) { } } # end if ZM_LOG_DATABASE_LIMIT + # Delete any sessions that are more ethan a week old. Limiting to 100 because mysql sucks + zmDbDo('DELETE FROM Sessions WHERE access < ? LIMIT 100', time - (60*60*24*7)); + sleep($Config{ZM_STATS_UPDATE_INTERVAL}); } # end while (1) From c156731f0be28a76977e29055ba350ed7f82f733 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 8 Dec 2020 10:33:25 -0500 Subject: [PATCH 02/53] Allow users with canView Events to view event list. Don't allow unarchive or delete if they don't have canEdit --- web/ajax/events.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/web/ajax/events.php b/web/ajax/events.php index 37e225527..b613fe10c 100644 --- a/web/ajax/events.php +++ b/web/ajax/events.php @@ -6,7 +6,7 @@ $data = array(); // INITIALIZE AND CHECK SANITY // -if ( !canEdit('Events') ) $message = 'Insufficient permissions for user '.$user['Username']; +if ( !canView('Events') ) $message = 'Insufficient permissions for user '.$user['Username']; if ( empty($_REQUEST['task']) ) { $message = 'Must specify a task'; @@ -74,10 +74,22 @@ if ( isset($_REQUEST['limit']) ) { switch ( $task ) { case 'archive' : + foreach ( $eids as $eid ) archiveRequest($task, $eid); + break; case 'unarchive' : + # The idea is that anyone can archive, but only people with Event Edit permission can unarchive.. + if ( !canEdit('Events') ) { + ajaxError('Insufficient permissions for user '.$user['Username']); + return; + } foreach ( $eids as $eid ) archiveRequest($task, $eid); break; case 'delete' : + if ( !canEdit('Events') ) { + ajaxError('Insufficient permissions for user '.$user['Username']); + return; + } + foreach ( $eids as $eid ) $data[] = deleteRequest($eid); break; case 'query' : From bfe5bb0249d366ee48be7894a109826d1f556fec Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 8 Dec 2020 11:19:22 -0500 Subject: [PATCH 03/53] Include code to handle when we are already logged in but trying to auth with a mismatched auth_hash --- web/includes/auth.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/web/includes/auth.php b/web/includes/auth.php index a4e1e4268..4084e8386 100644 --- a/web/includes/auth.php +++ b/web/includes/auth.php @@ -187,6 +187,26 @@ function getAuthUser($auth) { } // end if $auth == $authHash } // end foreach hour } // end foreach user + + if ( isset($_SESSION['username']) ) { + # In a multi-server case, we might be logged in as another user and so the auth hash didn't work + $sql = 'SELECT * FROM Users WHERE Enabled = 1 AND Username != ?'; + + foreach ( dbFetchAll($sql, NULL, $values) as $user ) { + $now = time(); + for ( $i = 0; $i < ZM_AUTH_HASH_TTL; $i++, $now -= 3600 ) { // Try for last TTL hours + $time = localtime($now); + $authKey = ZM_AUTH_HASH_SECRET.$user['Username'].$user['Password'].$remoteAddr.$time[2].$time[3].$time[4].$time[5]; + $authHash = md5($authKey); + + if ( $auth == $authHash ) { + return $user; + } // end if $auth == $authHash + } // end foreach hour + } // end foreach user + } // end if + } // end if using auth hash + } // end if using auth hash ZM\Error("Unable to authenticate user from auth hash '$auth'"); return null; From 84c7a117f5651023be66901589d156e46ccb21d7 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 8 Dec 2020 11:26:43 -0500 Subject: [PATCH 04/53] Use width and height attrs instead of css for rendering speed. Also alt doesn't need validHtmlStr because Event.Id will have no weird characters --- web/ajax/events.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/ajax/events.php b/web/ajax/events.php index b613fe10c..51949f84e 100644 --- a/web/ajax/events.php +++ b/web/ajax/events.php @@ -229,12 +229,12 @@ function queryRequest($filter, $search, $advsearch, $sort, $offset, $order, $lim $event = new ZM\Event($row); $scale = intval(5*100*ZM_WEB_LIST_THUMB_WIDTH / $event->Width()); - $imgSrc = $event->getThumbnailSrc(array(),'&'); + $imgSrc = $event->getThumbnailSrc(array(), '&'); $streamSrc = $event->getStreamSrc(array( 'mode'=>'jpeg', 'scale'=>$scale, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>'single', 'rate'=>'400'), '&'); // Modify the row data as needed - $row['imgHtml'] = '' .validHtmlStr('Event ' .$event->Id()). ''; + $row['imgHtml'] = 'Event '.$event->Id().''; $row['Name'] = validHtmlStr($row['Name']); $row['Archived'] = $row['Archived'] ? translate('Yes') : translate('No'); $row['Emailed'] = $row['Emailed'] ? translate('Yes') : translate('No'); From 63e36340c6a9a52250e4863e7f532c3341c327f1 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 8 Dec 2020 11:26:52 -0500 Subject: [PATCH 05/53] Remove extra } --- web/includes/auth.php | 1 - 1 file changed, 1 deletion(-) diff --git a/web/includes/auth.php b/web/includes/auth.php index 4084e8386..ced24ff9d 100644 --- a/web/includes/auth.php +++ b/web/includes/auth.php @@ -207,7 +207,6 @@ function getAuthUser($auth) { } // end if } // end if using auth hash - } // end if using auth hash ZM\Error("Unable to authenticate user from auth hash '$auth'"); return null; } // end getAuthUser($auth) From 63c483ba92545d707da75737489b0dcc068fefff Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 8 Dec 2020 11:27:18 -0500 Subject: [PATCH 06/53] canEditMonitors is set in skin.js.php --- web/skins/classic/views/js/watch.js.php | 1 - 1 file changed, 1 deletion(-) diff --git a/web/skins/classic/views/js/watch.js.php b/web/skins/classic/views/js/watch.js.php index 704ec01e2..d0ef131b6 100644 --- a/web/skins/classic/views/js/watch.js.php +++ b/web/skins/classic/views/js/watch.js.php @@ -73,7 +73,6 @@ var statusRefreshTimeout = ; var eventsRefreshTimeout = ; var imageRefreshTimeout = ; -var canEditMonitors = ; var canStreamNative = ; var canViewControl = ; From 69e540c10469ac2393c0ab4f3477255735caa15b Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Tue, 8 Dec 2020 14:25:48 -0600 Subject: [PATCH 07/53] deploy canView and canEdit js objects --- web/skins/classic/js/skin.js | 2 +- web/skins/classic/js/skin.js.php | 19 ++++++++------ web/skins/classic/views/js/controlcaps.js | 10 +++---- web/skins/classic/views/js/controlcaps.js.php | 1 - web/skins/classic/views/js/devices.js | 10 +++---- web/skins/classic/views/js/devices.js.php | 1 - web/skins/classic/views/js/event.js | 26 +++++++++---------- web/skins/classic/views/js/event.js.php | 1 - web/skins/classic/views/js/events.js | 26 +++++++++---------- web/skins/classic/views/js/groups.js | 4 +-- web/skins/classic/views/js/options.js | 8 +++--- web/skins/classic/views/js/options.js.php | 1 - web/skins/classic/views/js/watch.js | 10 +++---- web/skins/classic/views/js/watch.js.php | 1 - web/skins/classic/views/js/zone.js.php | 1 - 15 files changed, 59 insertions(+), 62 deletions(-) delete mode 100644 web/skins/classic/views/js/controlcaps.js.php delete mode 100644 web/skins/classic/views/js/devices.js.php diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js index 3d59b0898..ebfa5c0fe 100644 --- a/web/skins/classic/js/skin.js +++ b/web/skins/classic/js/skin.js @@ -241,7 +241,7 @@ if ( currentView != 'none' && currentView != 'login' ) { $j(document).ready(function() { // Load the Logout and State modals into the dom $j('#logoutButton').click(clickLogout); - if ( canEditSystem ) $j('#stateModalBtn').click(getStateModal); + if ( canEdit.System ) $j('#stateModalBtn').click(getStateModal); // Trigger autorefresh of the widget bar stats on the navbar if ( $j('.navbar').length ) { diff --git a/web/skins/classic/js/skin.js.php b/web/skins/classic/js/skin.js.php index 1288a1e80..b10598235 100644 --- a/web/skins/classic/js/skin.js.php +++ b/web/skins/classic/js/skin.js.php @@ -40,14 +40,17 @@ var thisUrl = ''; var serverId = ''; -var canEditSystem = ; -var canViewSystem = ; -var canEditEvents = ; -var canViewEvents = ; -var canEditMonitors = ; -var canViewMonitors = ; - -var canEditGroups = ; +var canView = new Object(); +var canEdit = new Object(); + + canView[""] = ; + canEdit[""] = ; + var ANIMATE_THUMBS = ; diff --git a/web/skins/classic/views/js/controlcaps.js b/web/skins/classic/views/js/controlcaps.js index 75e6b8817..ff1b3af30 100644 --- a/web/skins/classic/views/js/controlcaps.js +++ b/web/skins/classic/views/js/controlcaps.js @@ -43,7 +43,7 @@ function getDelConfirmModal(key) { // Manage the DELETE CONFIRMATION modal button function manageDelConfirmModalBtns() { document.getElementById("delConfirmBtn").addEventListener("click", function onDelConfirmClick(evt) { - if ( ! canEditControl ) { + if ( ! canEdit.Control ) { enoperm(); return; } @@ -67,9 +67,9 @@ function initPage() { function() { selections = table.bootstrapTable('getSelections'); - addNewBtn.prop('disabled', (selections.length || !canEditControl)); - editBtn.prop('disabled', !((selections.length == 1) && canEditControl)); - deleteBtn.prop('disabled', !(selections.length && canEditControl)); + addNewBtn.prop('disabled', (selections.length || !canEdit.Control)); + editBtn.prop('disabled', !((selections.length == 1) && canEdit.Control)); + deleteBtn.prop('disabled', !(selections.length && canEdit.Control)); }); // Init the bootstrap-table @@ -92,7 +92,7 @@ function initPage() { // Manage the DELETE button document.getElementById("deleteBtn").addEventListener("click", function onDeleteClick(evt) { - if ( ! canEditControl ) { + if ( ! canEdit.Control ) { enoperm(); return; } diff --git a/web/skins/classic/views/js/controlcaps.js.php b/web/skins/classic/views/js/controlcaps.js.php deleted file mode 100644 index 6db74d130..000000000 --- a/web/skins/classic/views/js/controlcaps.js.php +++ /dev/null @@ -1 +0,0 @@ -var canEditControl = ; diff --git a/web/skins/classic/views/js/devices.js b/web/skins/classic/views/js/devices.js index a164835b4..5167b2018 100644 --- a/web/skins/classic/views/js/devices.js +++ b/web/skins/classic/views/js/devices.js @@ -42,7 +42,7 @@ function getDelConfirmModal(key) { // Manage the DELETE CONFIRMATION modal button function manageDelConfirmModalBtns() { document.getElementById("delConfirmBtn").addEventListener("click", function onDelConfirmClick(evt) { - if ( ! canEditDevice ) { + if ( ! canEdit.Device ) { enoperm(); return; } @@ -91,9 +91,9 @@ function initPage() { // Init the bootstrap-table table.bootstrapTable({icons: icons}); - if ( canEditDevice ) enableDeviceModal(); + if ( canEdit.Device ) enableDeviceModal(); - newDeviceBtn.prop('disabled', !canEditDevice); + newDeviceBtn.prop('disabled', !canEdit.Device); // Manage the BACK button document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) { @@ -112,7 +112,7 @@ function initPage() { // Manage the DELETE button document.getElementById("deleteBtn").addEventListener("click", function onDeleteClick(evt) { - if ( ! canEditDevice ) { + if ( ! canEdit.Device ) { enoperm(); return; } @@ -130,7 +130,7 @@ function initPage() { function() { selections = table.bootstrapTable('getSelections'); - deleteBtn.prop('disabled', !(selections.length && canEditDevice)); + deleteBtn.prop('disabled', !(selections.length && canEdit.Device)); }); // Process mouse clicks on the table cells diff --git a/web/skins/classic/views/js/devices.js.php b/web/skins/classic/views/js/devices.js.php deleted file mode 100644 index f80541494..000000000 --- a/web/skins/classic/views/js/devices.js.php +++ /dev/null @@ -1 +0,0 @@ -var canEditDevice = ; diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js index 5550ee15c..37ef5966c 100644 --- a/web/skins/classic/views/js/event.js +++ b/web/skins/classic/views/js/event.js @@ -598,8 +598,8 @@ function getEventResponse(respObj, respText) { $j('dataStorage').text( eventData.Storage ); // Refresh the status of the archive buttons - archiveBtn.prop('disabled', !(!eventData.Archived && canEditEvents)); - unarchiveBtn.prop('disabled', !(eventData.Archived && canEditEvents)); + archiveBtn.prop('disabled', !(!eventData.Archived && canEdit.Events)); + unarchiveBtn.prop('disabled', !(eventData.Archived && canEdit.Events)); history.replaceState(null, null, '?view=event&eid=' + eventData.Id + filterQuery + sortQuery); //if popup removed, check if this allows forward // Technically, events can be different sizes, so may need to update the size of the image, but it might be better to have it stay scaled... @@ -1045,7 +1045,7 @@ function getDelConfirmModal() { // Manage the DELETE CONFIRMATION modal button function manageDelConfirmModalBtns() { document.getElementById("delConfirmBtn").addEventListener("click", function onDelConfirmClick(evt) { - if ( ! canEditEvents ) { + if ( ! canEdit.Events ) { enoperm(); return; } @@ -1134,13 +1134,13 @@ function initPage() { }); // enable or disable buttons based on current selection and user rights - renameBtn.prop('disabled', !canEditEvents); - archiveBtn.prop('disabled', !(!eventData.Archived && canEditEvents)); - unarchiveBtn.prop('disabled', !(eventData.Archived && canEditEvents)); - editBtn.prop('disabled', !canEditEvents); - exportBtn.prop('disabled', !canViewEvents); - downloadBtn.prop('disabled', !canViewEvents); - deleteBtn.prop('disabled', !canEditEvents); + renameBtn.prop('disabled', !canEdit.Events); + archiveBtn.prop('disabled', !(!eventData.Archived && canEdit.Events)); + unarchiveBtn.prop('disabled', !(eventData.Archived && canEdit.Events)); + editBtn.prop('disabled', !canEdit.Events); + exportBtn.prop('disabled', !canView.Events); + downloadBtn.prop('disabled', !canView.Events); + deleteBtn.prop('disabled', !canEdit.Events); // Don't enable the back button if there is no previous zm page to go back to backBtn.prop('disabled', !document.referrer.length); @@ -1183,7 +1183,7 @@ function initPage() { // Manage the UNARCHIVE button document.getElementById("unarchiveBtn").addEventListener("click", function onUnarchiveClick(evt) { - if ( ! canEditEvents ) { + if ( ! canEdit.Events ) { enoperm(); return; } @@ -1198,7 +1198,7 @@ function initPage() { // Manage the EDIT button document.getElementById("editBtn").addEventListener("click", function onEditClick(evt) { - if ( ! canEditEvents ) { + if ( ! canEdit.Events ) { enoperm(); return; } @@ -1253,7 +1253,7 @@ function initPage() { // Manage the DELETE button document.getElementById("deleteBtn").addEventListener("click", function onDeleteClick(evt) { - if ( ! canEditEvents ) { + if ( ! canEdit.Events ) { enoperm(); return; } diff --git a/web/skins/classic/views/js/event.js.php b/web/skins/classic/views/js/event.js.php index d24b12c2f..05d9f5ffb 100644 --- a/web/skins/classic/views/js/event.js.php +++ b/web/skins/classic/views/js/event.js.php @@ -63,7 +63,6 @@ var rate = ''; // really only used when setting up initial pl var scale = ""; var LabelFormat = "LabelFormat())?>"; -var canEditEvents = ; var streamTimeout = ; var canStreamNative = ; diff --git a/web/skins/classic/views/js/events.js b/web/skins/classic/views/js/events.js index 0ea67a095..cabcc76ce 100644 --- a/web/skins/classic/views/js/events.js +++ b/web/skins/classic/views/js/events.js @@ -58,8 +58,8 @@ function processRows(rows) { row.Id = '' + eid + ''; row.Name = '' + row.Name + '' + '
' + archived + emailed + '
'; - if ( canEditMonitors ) row.Monitor = '' + row.Monitor + ''; - if ( canEditEvents ) row.Cause = '' + row.Cause + ''; + if ( canEdit.Monitors ) row.Monitor = '' + row.Monitor + ''; + if ( canEdit.Events ) row.Cause = '' + row.Cause + ''; if ( row.Notes.indexOf('detected:') >= 0 ) { row.Cause = row.Cause + '
' + row.Notes + '
'; } else if ( row.Notes != 'Forced Web: ' ) { @@ -105,7 +105,7 @@ function getDelConfirmModal() { // Manage the DELETE CONFIRMATION modal button function manageDelConfirmModalBtns() { document.getElementById("delConfirmBtn").addEventListener("click", function onDelConfirmClick(evt) { - if ( ! canEditEvents ) { + if ( ! canEdit.Events ) { enoperm(); return; } @@ -163,13 +163,13 @@ function initPage() { function() { selections = table.bootstrapTable('getSelections'); - viewBtn.prop('disabled', !(selections.length && canViewEvents)); - archiveBtn.prop('disabled', !(selections.length && canEditEvents)); - unarchiveBtn.prop('disabled', !(getArchivedSelections()) && canEditEvents); - editBtn.prop('disabled', !(selections.length && canEditEvents)); - exportBtn.prop('disabled', !(selections.length && canViewEvents)); - downloadBtn.prop('disabled', !(selections.length && canViewEvents)); - deleteBtn.prop('disabled', !(selections.length && canEditEvents)); + viewBtn.prop('disabled', !(selections.length && canView.Events)); + archiveBtn.prop('disabled', !(selections.length && canEdit.Events)); + unarchiveBtn.prop('disabled', !(getArchivedSelections()) && canEdit.Events); + editBtn.prop('disabled', !(selections.length && canEdit.Events)); + exportBtn.prop('disabled', !(selections.length && canView.Events)); + downloadBtn.prop('disabled', !(selections.length && canView.Events)); + deleteBtn.prop('disabled', !(selections.length && canEdit.Events)); }); // Don't enable the back button if there is no previous zm page to go back to @@ -228,7 +228,7 @@ function initPage() { // Manage the UNARCHIVE button document.getElementById("unarchiveBtn").addEventListener("click", function onUnarchiveClick(evt) { - if ( ! canEditEvents ) { + if ( ! canEdit.Events ) { enoperm(); return; } @@ -246,7 +246,7 @@ function initPage() { // Manage the EDIT button document.getElementById("editBtn").addEventListener("click", function onEditClick(evt) { - if ( ! canEditEvents ) { + if ( ! canEdit.Events ) { enoperm(); return; } @@ -292,7 +292,7 @@ function initPage() { // Manage the DELETE button document.getElementById("deleteBtn").addEventListener("click", function onDeleteClick(evt) { - if ( ! canEditEvents ) { + if ( ! canEdit.Events ) { enoperm(); return; } diff --git a/web/skins/classic/views/js/groups.js b/web/skins/classic/views/js/groups.js index e5b87ef02..571269ea4 100644 --- a/web/skins/classic/views/js/groups.js +++ b/web/skins/classic/views/js/groups.js @@ -50,7 +50,7 @@ function deleteGroup( element ) { } function configureButtons( element ) { - if ( canEditGroups ) { + if ( canEdit.Groups ) { var form = element.form; if ( element.checked ) { form.deleteBtn.disabled = (element.value == 0); @@ -64,7 +64,7 @@ function configModalBtns() { console.log("No groupForm found"); return; } - if ( !canEditGroups ) { + if ( !canEdit.Groups ) { console.log("Cannot edit groups"); form.elements['action'].disabled = disabled; return; diff --git a/web/skins/classic/views/js/options.js b/web/skins/classic/views/js/options.js index 96ede5a18..2566e2ab7 100644 --- a/web/skins/classic/views/js/options.js +++ b/web/skins/classic/views/js/options.js @@ -62,11 +62,11 @@ function initPage() { var NewStorageBtn = $j('#NewStorageBtn'); var NewServerBtn = $j('#NewServerBtn'); - if ( canEditSystem ) enableStorageModal(); - if ( canEditSystem ) enableServerModal(); + if ( canEdit.System ) enableStorageModal(); + if ( canEdit.System ) enableServerModal(); - NewStorageBtn.prop('disabled', !canEditSystem); - NewServerBtn.prop('disabled', !canEditSystem); + NewStorageBtn.prop('disabled', !canEdit.System); + NewServerBtn.prop('disabled', !canEdit.System); } $j(document).ready(function() { diff --git a/web/skins/classic/views/js/options.js.php b/web/skins/classic/views/js/options.js.php index 5281cde8c..49a4e94d3 100644 --- a/web/skins/classic/views/js/options.js.php +++ b/web/skins/classic/views/js/options.js.php @@ -4,4 +4,3 @@ if ( restartWarning ) { alert( "" ); } -var canEditSystem = ; diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js index 84c0382dd..6871095e6 100644 --- a/web/skins/classic/views/js/watch.js +++ b/web/skins/classic/views/js/watch.js @@ -267,7 +267,7 @@ function getStreamCmdResponse(respObj, respText) { setButtonState('zoomOutBtn', 'inactive'); } - if ( canEditMonitors ) { + if ( canEdit.Monitors ) { if ( streamStatus.enabled ) { enableAlmBtn.addClass('disabled'); enableAlmBtn.prop('title', disableAlarmsStr); @@ -285,7 +285,7 @@ function getStreamCmdResponse(respObj, respText) { forceAlmBtn.prop('disabled', true); } enableAlmBtn.prop('disabled', false); - } // end if canEditMonitors + } // end if canEdit.Monitors if ( streamStatus.auth ) { auth_hash = streamStatus.auth; @@ -772,7 +772,7 @@ function processClicks(event, field, value, row, $element) { // Manage the DELETE CONFIRMATION modal button function manageDelConfirmModalBtns() { document.getElementById("delConfirmBtn").addEventListener("click", function onDelConfirmClick(evt) { - if ( ! canEditEvents ) { + if ( ! canEdit.Events ) { enoperm(); return; } @@ -795,7 +795,7 @@ function manageDelConfirmModalBtns() { } function initPage() { - if ( canViewControl ) { + if ( canView.Control ) { // Load the PTZ Preset modal into the DOM if ( monitorControllable ) getCtrlPresetModal(); // Load the settings modal into the DOM @@ -866,7 +866,7 @@ function initPage() { }); // Only enable the settings button for local cameras - settingsBtn.prop('disabled', !canViewControl); + settingsBtn.prop('disabled', !canView.Control); if ( monitorType != 'Local' ) settingsBtn.hide(); // Init the bootstrap-table diff --git a/web/skins/classic/views/js/watch.js.php b/web/skins/classic/views/js/watch.js.php index d0ef131b6..444ae4edd 100644 --- a/web/skins/classic/views/js/watch.js.php +++ b/web/skins/classic/views/js/watch.js.php @@ -74,7 +74,6 @@ var eventsRefreshTimeout = ; var imageRefreshTimeout = ; var canStreamNative = ; -var canViewControl = ; var canPlayPauseAudio = Browser.ie; diff --git a/web/skins/classic/views/js/zone.js.php b/web/skins/classic/views/js/zone.js.php index 9fadea32c..dc9b823c2 100644 --- a/web/skins/classic/views/js/zone.js.php +++ b/web/skins/classic/views/js/zone.js.php @@ -128,7 +128,6 @@ var streamSrc = ""; var statusRefreshTimeout = ; var imageRefreshTimeout = ; -var canEditMonitors = ; var canStreamNative = ; var canPlayPauseAudio = Browser.ie; From 4e09a328367103182ae6f2158157af4530771f1d Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Tue, 8 Dec 2020 14:36:19 -0600 Subject: [PATCH 08/53] fix one canEdit --- web/skins/classic/views/js/console.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/js/console.js b/web/skins/classic/views/js/console.js index 4a64171aa..688d0d5ca 100644 --- a/web/skins/classic/views/js/console.js +++ b/web/skins/classic/views/js/console.js @@ -112,7 +112,7 @@ function reloadWindow() { function manageFunctionModal(evt) { evt.preventDefault(); - if ( !canEditEvents ) { + if ( !canEdit.Events ) { enoperm(); return; } From 951debab7fdb80536e84dece28b63d324fd5167b Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Wed, 9 Dec 2020 12:25:40 -0600 Subject: [PATCH 09/53] watch.js - replace mootools ajax w/ jquery --- web/skins/classic/views/js/watch.js | 212 +++++++++++++++------------- 1 file changed, 116 insertions(+), 96 deletions(-) diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js index 6871095e6..d308af7a0 100644 --- a/web/skins/classic/views/js/watch.js +++ b/web/skins/classic/views/js/watch.js @@ -9,23 +9,6 @@ var forceAlmBtn = $j('#forceAlmBtn'); var table = $j('#eventList'); var filterQuery = '&filter[Query][terms][0][attr]=MonitorId&filter[Query][terms][0][op]=%3d&filter[Query][terms][0][val]='+monitorId; -if ( monitorType != 'WebSite' ) { - var streamCmdParms = 'view=request&request=stream&connkey='+connKey; - if ( auth_hash ) { - streamCmdParms += '&auth='+auth_hash; - } - var streamCmdReq = new Request.JSON( { - url: monitorUrl, - method: 'get', - timeout: AJAX_TIMEOUT, - link: 'chain', - onError: getStreamCmdError, - onSuccess: getStreamCmdResponse, - onFailure: getStreamCmdFailure - } ); - var streamCmdTimer = null; -} - /* This is the format of the json object sent by bootstrap-table @@ -194,10 +177,6 @@ function getStreamCmdError(text, error) { window.location.reload(); } -function getStreamCmdFailure(xhr) { - console.log(xhr); -} - function getStreamCmdResponse(respObj, respText) { watchdogOk('stream'); if ( streamCmdTimer ) { @@ -296,10 +275,7 @@ function getStreamCmdResponse(respObj, respText) { var newSrc = oldSrc.replace(/auth=\w+/i, 'auth='+streamStatus.auth); streamImg.src = newSrc; } - streamCmdParms = streamCmdParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth); - statusCmdParms = statusCmdParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth); table.bootstrapTable('refresh'); - controlParms = controlParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth); } // end if have a new auth hash } // end if respObj.status } else { @@ -339,7 +315,10 @@ function streamCmdPause( action ) { setButtonState('fastRevBtn', 'inactive'); } if ( action ) { - streamCmdReq.send(streamCmdParms+"&command="+CMD_PAUSE); + var data = new Object(); + if ( auth_hash ) data.auth = auth_hash; + data.command = CMD_PAUSE; + streamCmdReq(data); } } @@ -364,10 +343,21 @@ function streamCmdPlay( action ) { } } if ( action ) { - streamCmdReq.send(streamCmdParms+"&command="+CMD_PLAY); + var data = new Object(); + if ( auth_hash ) data.auth = auth_hash; + data.command = CMD_PLAY; + streamCmdReq(data); } } +function streamCmdReq(data) { + $j.getJSON(thisUrl + '?view=request&request=stream&connkey='+connKey, data) + .done(getStreamCmdResponse) + .fail(getStreamCmdError); + + var streamCmdTimer = null; +} + function streamCmdStop( action ) { setButtonState('pauseBtn', 'inactive'); setButtonState('playBtn', 'unavail'); @@ -379,7 +369,10 @@ function streamCmdStop( action ) { setButtonState('fastRevBtn', 'unavail'); } if ( action ) { - streamCmdReq.send(streamCmdParms+"&command="+CMD_STOP); + var data = new Object(); + if ( auth_hash ) data.auth = auth_hash; + data.command = CMD_STOP; + streamCmdReq(data); } setButtonState('stopBtn', 'unavail'); setButtonState('playBtn', 'active'); @@ -396,7 +389,10 @@ function streamCmdFastFwd( action ) { setButtonState('fastRevBtn', 'inactive'); } if ( action ) { - streamCmdReq.send(streamCmdParms+"&command="+CMD_FASTFWD); + var data = new Object(); + if ( auth_hash ) data.auth = auth_hash; + data.command = CMD_FASTFWD; + streamCmdReq(data); } } @@ -411,7 +407,10 @@ function streamCmdSlowFwd( action ) { setButtonState('fastRevBtn', 'inactive'); } if ( action ) { - streamCmdReq.send(streamCmdParms+"&command="+CMD_SLOWFWD); + var data = new Object(); + if ( auth_hash ) data.auth = auth_hash; + data.command = CMD_SLOWFWD; + streamCmdReq(data); } setButtonState('pauseBtn', 'active'); if ( monitorStreamReplayBuffer ) { @@ -430,7 +429,10 @@ function streamCmdSlowRev( action ) { setButtonState('fastRevBtn', 'inactive'); } if ( action ) { - streamCmdReq.send(streamCmdParms+"&command="+CMD_SLOWREV); + var data = new Object(); + if ( auth_hash ) data.auth = auth_hash; + data.command = CMD_SLOWREV; + streamCmdReq(data); } setButtonState('pauseBtn', 'active'); if ( monitorStreamReplayBuffer ) { @@ -449,43 +451,51 @@ function streamCmdFastRev( action ) { setButtonState('fastRevBtn', 'inactive'); } if ( action ) { - streamCmdReq.send(streamCmdParms+"&command="+CMD_FASTREV); + var data = new Object(); + if ( auth_hash ) data.auth = auth_hash; + data.command = CMD_FASTREV; + streamCmdReq(data); } } function streamCmdZoomIn( x, y ) { - streamCmdReq.send(streamCmdParms+"&command="+CMD_ZOOMIN+"&x="+x+"&y="+y); + var data = new Object(); + if ( auth_hash ) data.auth = auth_hash; + data.x = x; + data.y = y; + data.command = CMD_ZOOMIN; + streamCmdReq(data); } function streamCmdZoomOut() { - streamCmdReq.send(streamCmdParms+"&command="+CMD_ZOOMOUT); + var data = new Object(); + if ( auth_hash ) data.auth = auth_hash; + data.command = CMD_ZOOMOUT; + streamCmdReq(data); } function streamCmdScale( scale ) { - streamCmdReq.send(streamCmdParms+"&command="+CMD_SCALE+"&scale="+scale); + var data = new Object(); + if ( auth_hash ) data.auth = auth_hash; + data.command = CMD_SCALE; + data.scale = scale; + streamCmdReq(data); } function streamCmdPan( x, y ) { - streamCmdReq.send(streamCmdParms+"&command="+CMD_PAN+"&x="+x+"&y="+y); + var data = new Object(); + if ( auth_hash ) data.auth = auth_hash; + data.x = x; + data.y = y; + data.command = CMD_PAN; + streamCmdReq(data); } function streamCmdQuery() { - streamCmdReq.send(streamCmdParms+"&command="+CMD_QUERY); -} - -if ( monitorType != 'WebSite' ) { - var statusCmdParms = "view=request&request=status&entity=monitor&id="+monitorId+"&element[]=Status&element[]=FrameRate"; - if ( auth_hash ) { - statusCmdParms += '&auth='+auth_hash; - } - var statusCmdReq = new Request.JSON( { - url: monitorUrl, - method: 'get', - timeout: AJAX_TIMEOUT, - link: 'cancel', - onSuccess: getStatusCmdResponse - } ); - var statusCmdTimer = null; + var data = new Object(); + if ( auth_hash ) data.auth = auth_hash; + data.command = CMD_QUERY; + streamCmdReq(data); } function getStatusCmdResponse(respObj, respText) { @@ -509,22 +519,24 @@ function getStatusCmdResponse(respObj, respText) { } function statusCmdQuery() { - statusCmdReq.send(statusCmdParms); + $j.getJSON(thisUrl + '?view=request&request=status&entity=monitor&element[]=Status&element[]=FrameRate&id='+monitorId) + .done(getStatusCmdResponse) + .fail(logAjaxFail); + + var streamCmdTimer = null; } -if ( monitorType != 'WebSite' ) { - var alarmCmdParms = 'view=request&request=alarm&id='+monitorId; - if ( auth_hash ) { - alarmCmdParms += '&auth='+auth_hash; - } - var alarmCmdReq = new Request.JSON( { - url: monitorUrl, - method: 'get', - timeout: AJAX_TIMEOUT, - link: 'cancel', - onSuccess: getAlarmCmdResponse, - onTimeout: streamCmdQuery - } ); +function alarmCmdReq(data) { + $j.getJSON(thisUrl + '?view=request&request=alarm&id='+monitorId, data) + .done(getAlarmCmdResponse) + .fail(function(jqxhr, textStatus, error) { + if(textstatus === "timeout") { + streamCmdQuery(); + } else { + logAjaxFail(jqxhr, textStatus, error); + } + }); + var alarmCmdFirst = true; } @@ -533,11 +545,17 @@ function getAlarmCmdResponse(respObj, respText) { } function cmdDisableAlarms() { - alarmCmdReq.send(alarmCmdParms+"&command=disableAlarms"); + var data = new Object(); + if ( auth_hash ) data.auth = auth_hash; + data.command = 'disableAlarms'; + alarmCmdReq(data); } function cmdEnableAlarms() { - alarmCmdReq.send(alarmCmdParms+"&command=enableAlarms"); + var data = new Object(); + if ( auth_hash ) data.auth = auth_hash; + data.command = 'enableAlarms'; + alarmCmdReq(data); } function cmdAlarm() { @@ -549,17 +567,19 @@ function cmdAlarm() { } function cmdForceAlarm() { - alarmCmdReq.send(alarmCmdParms+"&command=forceAlarm"); - if ( window.event ) { - window.event.preventDefault(); - } + var data = new Object(); + if ( auth_hash ) data.auth = auth_hash; + data.command = 'forceAlarm'; + alarmCmdReq(data); + if ( window.event ) window.event.preventDefault(); } function cmdCancelForcedAlarm() { - alarmCmdReq.send(alarmCmdParms+"&command=cancelForcedAlarm"); - if ( window.event ) { - window.event.preventDefault(); - } + var data = new Object(); + if ( auth_hash ) data.auth = auth_hash; + data.command = 'cancelForcedAlarm'; + alarmCmdReq(data); + if ( window.event ) window.event.preventDefault(); return false; } @@ -571,18 +591,10 @@ function cmdForce() { } } -if ( monitorType != 'WebSite' ) { - var controlParms = 'view=request&request=control&id='+monitorId; - if ( auth_hash ) { - controlParms += '&auth='+auth_hash; - } - var controlReq = new Request.JSON( { - url: monitorUrl, - method: 'post', - timeout: AJAX_TIMEOUT, - link: 'cancel', - onSuccess: getControlResponse - } ); +function controlReq(data) { + $j.getJSON(thisUrl + '?view=request&request=control&id='+monitorId, data) + .done(getControlResponse) + .fail(logAjaxFail); } function getControlResponse(respObj, respText) { @@ -601,7 +613,8 @@ function controlCmd(event) { xtell = button.getAttribute('data-xtell'); ytell = button.getAttribute('data-ytell'); - var locParms = ''; + var data = new Object(); + if ( event && (xtell || ytell) ) { var target = event.target; var offset = $j(target).offset(); @@ -618,7 +631,7 @@ function controlCmd(event) { } else if ( xtell == 2 ) { xge = 2*(50 - xge); } - locParms += '&xge='+xge; + data.xge = xge; } if ( ytell ) { var yge = parseInt((y*100)/height); @@ -627,21 +640,28 @@ function controlCmd(event) { } else if ( ytell == 2 ) { yge = 2*(50 - yge); } - locParms += '&yge='+yge; + data.yge = yge; } } - controlReq.send(controlParms+"&control="+control+locParms); + + if ( auth_hash ) data.auth = auth_hash; + data.control = control + controlReq(data); + if ( streamMode == 'single' ) { fetchImage.pass($('imageFeed').getElement('img')).delay(1000); } } function controlCmdImage( x, y ) { - var imageControlParms = controlParms; - imageControlParms += '&scale='+scale; - imageControlParms += '&control='+imageControlMode; - - controlReq.send( imageControlParms+"&x="+x+"&y="+y ); + var data = new Object(); + if ( auth_hash ) data.auth = auth_hash; + data.scale = scale; + data.control = imageControlMode; + data.x = x; + data.y = y; + controlReq(data); + if ( streamMode == 'single' ) { fetchImage.pass( $('imageFeed').getElement('img') ).delay( 1000 ); } From eb4b7f248d488a1ac73eb5d2f6c1cfc092c0e416 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sat, 5 Dec 2020 19:50:58 -0500 Subject: [PATCH 10/53] handle sort_field and limit not existing in _REQUEST --- web/includes/functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/includes/functions.php b/web/includes/functions.php index d5478b74f..c2072a706 100644 --- a/web/includes/functions.php +++ b/web/includes/functions.php @@ -1200,8 +1200,8 @@ function sortHeader($field, $querySep='&') { '?view='.$view, 'page=1'.(isset($_REQUEST['filter'])?$_REQUEST['filter']['query']:''), 'sort_field='.$field, - 'sort_asc='.($_REQUEST['sort_field'] == $field ? !$_REQUEST['sort_asc'] : 0), - 'limit='.validInt($_REQUEST['limit']), + 'sort_asc='.( ( isset($_REQUEST['sort_field']) and ( $_REQUEST['sort_field'] == $field ) ) ? !$_REQUEST['sort_asc'] : 0), + 'limit='.(isset($_REQUEST['limit']) ? validInt($_REQUEST['limit']) : ''), (isset($_REQUEST['eid']) ? 'eid='.$_REQUEST['eid'] : '' ), )); } From 5482d3b3d54001ecae4a154d2a6fd4dd9ffc0421 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 9 Dec 2020 17:56:09 -0500 Subject: [PATCH 11/53] Quiet error when calling logout when already logged out --- web/includes/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/includes/auth.php b/web/includes/auth.php index ced24ff9d..5a95dec94 100644 --- a/web/includes/auth.php +++ b/web/includes/auth.php @@ -105,7 +105,7 @@ function validateUser($username='', $password='') { function userLogout() { global $user; - ZM\Info('User "'.$user['Username'].'" logged out'); + ZM\Info('User "'.($user?$user['Username']:'no one').'" logged out'); $user = null;// unset only clears the local variable zm_session_clear(); } From 026b8cfb0c7e63e8937c5a566d489d9eae92d2ee Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Wed, 9 Dec 2020 17:58:46 -0600 Subject: [PATCH 12/53] eslint --- web/skins/classic/views/js/watch.js | 47 ++++++++++++++--------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js index d308af7a0..6aed02d63 100644 --- a/web/skins/classic/views/js/watch.js +++ b/web/skins/classic/views/js/watch.js @@ -1,3 +1,4 @@ +var streamCmdTimer = null; var streamStatus; var auth_hash; var alarmState = STATE_IDLE; @@ -315,7 +316,7 @@ function streamCmdPause( action ) { setButtonState('fastRevBtn', 'inactive'); } if ( action ) { - var data = new Object(); + var data = {}; if ( auth_hash ) data.auth = auth_hash; data.command = CMD_PAUSE; streamCmdReq(data); @@ -343,7 +344,7 @@ function streamCmdPlay( action ) { } } if ( action ) { - var data = new Object(); + var data = {}; if ( auth_hash ) data.auth = auth_hash; data.command = CMD_PLAY; streamCmdReq(data); @@ -369,7 +370,7 @@ function streamCmdStop( action ) { setButtonState('fastRevBtn', 'unavail'); } if ( action ) { - var data = new Object(); + var data = {}; if ( auth_hash ) data.auth = auth_hash; data.command = CMD_STOP; streamCmdReq(data); @@ -389,7 +390,7 @@ function streamCmdFastFwd( action ) { setButtonState('fastRevBtn', 'inactive'); } if ( action ) { - var data = new Object(); + var data = {}; if ( auth_hash ) data.auth = auth_hash; data.command = CMD_FASTFWD; streamCmdReq(data); @@ -407,7 +408,7 @@ function streamCmdSlowFwd( action ) { setButtonState('fastRevBtn', 'inactive'); } if ( action ) { - var data = new Object(); + var data = {}; if ( auth_hash ) data.auth = auth_hash; data.command = CMD_SLOWFWD; streamCmdReq(data); @@ -429,7 +430,7 @@ function streamCmdSlowRev( action ) { setButtonState('fastRevBtn', 'inactive'); } if ( action ) { - var data = new Object(); + var data = {}; if ( auth_hash ) data.auth = auth_hash; data.command = CMD_SLOWREV; streamCmdReq(data); @@ -451,7 +452,7 @@ function streamCmdFastRev( action ) { setButtonState('fastRevBtn', 'inactive'); } if ( action ) { - var data = new Object(); + var data = {}; if ( auth_hash ) data.auth = auth_hash; data.command = CMD_FASTREV; streamCmdReq(data); @@ -459,7 +460,7 @@ function streamCmdFastRev( action ) { } function streamCmdZoomIn( x, y ) { - var data = new Object(); + var data = {}; if ( auth_hash ) data.auth = auth_hash; data.x = x; data.y = y; @@ -468,22 +469,22 @@ function streamCmdZoomIn( x, y ) { } function streamCmdZoomOut() { - var data = new Object(); + var data = {}; if ( auth_hash ) data.auth = auth_hash; data.command = CMD_ZOOMOUT; streamCmdReq(data); } function streamCmdScale( scale ) { - var data = new Object(); + var data = {}; if ( auth_hash ) data.auth = auth_hash; data.command = CMD_SCALE; data.scale = scale; - streamCmdReq(data); + streamCmdReq(data); } function streamCmdPan( x, y ) { - var data = new Object(); + var data = {}; if ( auth_hash ) data.auth = auth_hash; data.x = x; data.y = y; @@ -492,7 +493,7 @@ function streamCmdPan( x, y ) { } function streamCmdQuery() { - var data = new Object(); + var data = {}; if ( auth_hash ) data.auth = auth_hash; data.command = CMD_QUERY; streamCmdReq(data); @@ -530,14 +531,12 @@ function alarmCmdReq(data) { $j.getJSON(thisUrl + '?view=request&request=alarm&id='+monitorId, data) .done(getAlarmCmdResponse) .fail(function(jqxhr, textStatus, error) { - if(textstatus === "timeout") { + if (textstatus === "timeout") { streamCmdQuery(); } else { logAjaxFail(jqxhr, textStatus, error); } }); - - var alarmCmdFirst = true; } function getAlarmCmdResponse(respObj, respText) { @@ -545,14 +544,14 @@ function getAlarmCmdResponse(respObj, respText) { } function cmdDisableAlarms() { - var data = new Object(); + var data = {}; if ( auth_hash ) data.auth = auth_hash; data.command = 'disableAlarms'; alarmCmdReq(data); } function cmdEnableAlarms() { - var data = new Object(); + var data = {}; if ( auth_hash ) data.auth = auth_hash; data.command = 'enableAlarms'; alarmCmdReq(data); @@ -567,7 +566,7 @@ function cmdAlarm() { } function cmdForceAlarm() { - var data = new Object(); + var data = {}; if ( auth_hash ) data.auth = auth_hash; data.command = 'forceAlarm'; alarmCmdReq(data); @@ -575,7 +574,7 @@ function cmdForceAlarm() { } function cmdCancelForcedAlarm() { - var data = new Object(); + var data = {}; if ( auth_hash ) data.auth = auth_hash; data.command = 'cancelForcedAlarm'; alarmCmdReq(data); @@ -613,7 +612,7 @@ function controlCmd(event) { xtell = button.getAttribute('data-xtell'); ytell = button.getAttribute('data-ytell'); - var data = new Object(); + var data = {}; if ( event && (xtell || ytell) ) { var target = event.target; @@ -645,7 +644,7 @@ function controlCmd(event) { } if ( auth_hash ) data.auth = auth_hash; - data.control = control + data.control = control; controlReq(data); if ( streamMode == 'single' ) { @@ -654,14 +653,14 @@ function controlCmd(event) { } function controlCmdImage( x, y ) { - var data = new Object(); + var data = {}; if ( auth_hash ) data.auth = auth_hash; data.scale = scale; data.control = imageControlMode; data.x = x; data.y = y; controlReq(data); - + if ( streamMode == 'single' ) { fetchImage.pass( $('imageFeed').getElement('img') ).delay( 1000 ); } From c43ffcf58f012cf431a47c9a007b5002b41c7352 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Wed, 9 Dec 2020 18:02:34 -0600 Subject: [PATCH 13/53] eslint --- web/skins/classic/js/skin.js.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/skins/classic/js/skin.js.php b/web/skins/classic/js/skin.js.php index b10598235..a15d32526 100644 --- a/web/skins/classic/js/skin.js.php +++ b/web/skins/classic/js/skin.js.php @@ -40,8 +40,8 @@ var thisUrl = ''; var serverId = ''; -var canView = new Object(); -var canEdit = new Object(); +var canView = {}; +var canEdit = {}; Date: Wed, 9 Dec 2020 18:19:10 -0600 Subject: [PATCH 14/53] don't set zoom class in frames.js --- web/skins/classic/views/js/frames.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/skins/classic/views/js/frames.js b/web/skins/classic/views/js/frames.js index 1451c6eeb..85c2a05ef 100644 --- a/web/skins/classic/views/js/frames.js +++ b/web/skins/classic/views/js/frames.js @@ -118,8 +118,7 @@ function initPage() { var thumb_ndx = $j('#framesTable tr th').filter(function() { return $j(this).text().trim() == 'Thumbnail'; }).index(); - var thmbClass = WEB_ANIMATE_THUMBS ? 'colThumbnail zoom' : 'colThumbnail'; - table.find("tr td:nth-child(" + (thumb_ndx+1) + ")").addClass(thmbClass); + table.find("tr td:nth-child(" + (thumb_ndx+1) + ")").addClass('colThumbnail'); }); } From e0ac68786f2b4ffdb3ab983f4dd0359c912b80e0 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Wed, 9 Dec 2020 18:48:58 -0600 Subject: [PATCH 15/53] remove unneeded thumb animation functions from frames.js --- web/skins/classic/views/js/frames.js | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/web/skins/classic/views/js/frames.js b/web/skins/classic/views/js/frames.js index 85c2a05ef..3e8517fd9 100644 --- a/web/skins/classic/views/js/frames.js +++ b/web/skins/classic/views/js/frames.js @@ -26,27 +26,6 @@ function processRows(rows) { return rows; } -function thumbnail_onmouseover(event) { - var img = event.target; - img.src = ''; - img.src = img.getAttribute('full_img_src'); -} - -function thumbnail_onmouseout(event) { - var img = event.target; - img.src = ''; - img.src = img.getAttribute('img_src'); -} - -function initThumbAnimation() { - if ( WEB_ANIMATE_THUMBS ) { - $j('.colThumbnail img').each(function() { - this.addEventListener('mouseover', thumbnail_onmouseover, false); - this.addEventListener('mouseout', thumbnail_onmouseout, false); - }); - } -} - function processClicks(event, field, value, row, $element) { if ( field == 'Score' ) { window.location.assign('?view=stats&eid='+row.EventId+'&fid='+row.FrameId); From 3a4cdb7e5041599675253b3315e653adf4629f50 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Wed, 9 Dec 2020 20:06:38 -0600 Subject: [PATCH 16/53] eslint --- web/skins/classic/views/js/watch.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js index 6aed02d63..1fe53744e 100644 --- a/web/skins/classic/views/js/watch.js +++ b/web/skins/classic/views/js/watch.js @@ -356,7 +356,7 @@ function streamCmdReq(data) { .done(getStreamCmdResponse) .fail(getStreamCmdError); - var streamCmdTimer = null; + streamCmdTimer = null; } function streamCmdStop( action ) { @@ -524,7 +524,7 @@ function statusCmdQuery() { .done(getStatusCmdResponse) .fail(logAjaxFail); - var streamCmdTimer = null; + streamCmdTimer = null; } function alarmCmdReq(data) { From 9fb953bc848ade9a6302268aa27489dd5b68ef21 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Thu, 10 Dec 2020 07:24:48 -0600 Subject: [PATCH 17/53] set the right image attributes for frames view --- web/skins/classic/js/skin.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js index ebfa5c0fe..925018a12 100644 --- a/web/skins/classic/js/skin.js +++ b/web/skins/classic/js/skin.js @@ -894,8 +894,9 @@ function thumbnail_onmouseover(event) { timeout = setTimeout(function() { var img = event.target; var imgClass = ( currentView == 'console' ) ? 'zoom-console' : 'zoom'; + var imgAttr = ( currentView == 'frames' ) ? 'full_img_src' : 'stream_src'; img.src = ''; - img.src = img.getAttribute('stream_src'); + img.src = img.getAttribute(imgAttr); img.addClass(imgClass); }, 350); } @@ -904,8 +905,9 @@ function thumbnail_onmouseout(event) { clearTimeout(timeout); var img = event.target; var imgClass = ( currentView == 'console' ) ? 'zoom-console' : 'zoom'; + var imgAttr = ( currentView == 'frames' ) ? 'img_src' : 'still_src'; img.src = ''; - img.src = img.getAttribute('still_src'); + img.src = img.getAttribute(imgAttr); img.removeClass(imgClass); } From 37d4b3472f43ddb251f3433ec59126bb0f8cc60d Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 10 Dec 2020 13:43:16 -0500 Subject: [PATCH 18/53] Add useful help for function modal describing each mode and the purpose of the Enabled checkbox --- web/ajax/modals/function.php | 24 +++++++- web/lang/en_gb.php | 58 ++++++++++++++++++++ web/skins/classic/css/base/views/console.css | 3 + web/skins/classic/views/js/console.js | 11 ++++ 4 files changed, 93 insertions(+), 3 deletions(-) diff --git a/web/ajax/modals/function.php b/web/ajax/modals/function.php index e6bab2718..44e23b711 100644 --- a/web/ajax/modals/function.php +++ b/web/ajax/modals/function.php @@ -37,11 +37,29 @@ if ( !canEdit('Monitors') ) return;
-

+

+ 'newFunction')); ?> - +
+ $translated ) { + if ( isset($OLANG['FUNCTION_'.strtoupper($fn)]) ) { + echo '
'.$OLANG['FUNCTION_'.strtoupper($fn)]['Help'].'
'; + } + } +?> +
+
+
+ -

+'.$OLANG['FUNCTION_ANALYSIS_ENABLED']['Help'].'
'; + } +?> + +
diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php index 0877f7399..9b9979b3b 100644 --- a/web/lang/en_gb.php +++ b/web/lang/en_gb.php @@ -1073,6 +1073,64 @@ $OLANG = array( certainly not what you want! To unlink monitors you can ctrl-click. ' ), + 'FUNCTION_NONE' => array( + 'Help' => ' + In None mode no processes are started. No capturing will occur. + ' + ), + 'FUNCTION_MONITOR' => array( + 'Help' => ' + In Monitor mode the capture process (zmc) will connect to the camera and stream data. + It will be decoded if necessary and live viewing will be possible. + No motion detection will be performed. This monitor type cannot save video. + ' + ), + 'FUNCTION_MODECT' => array( + 'Help' => ' + In Modect mode the capture process (zmc) will connect to the camera and stream data. + It will be decoded if necessary and live viewing will be possible. + In addition a process (zma) will analyse the video for motion. + When motion is detected, events will be created and video will be stored. + Motion data will be stored in the database for each event. + Events may also be triggered externally (zmtrigger) or by linked monitors. + ' + ), + 'FUNCTION_RECORD' => array( + 'Help' => ' + In Record mode the capture process (zmc) will connect to the camera and stream data. + It will be decoded if necessary and live viewing will be possible. + In addition a process (zma) will run but will not perform motion detection. + Events will be created at fixed intervals and video will be stored. + ' + ), + 'FUNCTION_MOCORD' => array( + 'Help' => ' + In Mocord mode the capture process (zmc) will connect to the camera and stream data. + It will be decoded if necessary and live viewing will be possible. + In addition a process (zma) will analyse the video for motion. + Events will be created at fixed intervals or at start and stop of motion. + Video will always be stored to disk and events will have the motion data stored in the database. + Events may also be triggered externally (zmtrigger) or by linked monitors. + ' + ), + 'FUNCTION_NODECT' => array( + 'Help' => ' + In Nodect mode the capture process (zmc) will connect to the camera and stream data. + It will be decoded if necessary and live viewing will be possible. + In addition a process (zma) will run and will check any linked cameras for their alarm status. + When linked cameras or an external trigger (zmtrigger) are alarmed, events will be created + and video will be stored. No other motion detection will occur. + ' + ), + 'FUNCTION_ANALYSIS_ENABLED' => array( + 'Help' => ' + When in Modect, Mocord, Nodect or RECORD mode the analysis process can be turned on/off. + This setting sets the default state when the process starts up. + It can then be turned on/off through external triggers zmtrigger zmu or the web ui. + When not enabled no motion detection or linked monitor checking will be performed and + no events will be created. The zma process will still be running waiting to be enabled. + ' + ) // 'LANG_DEFAULT' => array( // 'Prompt' => "This is a new prompt for this option", diff --git a/web/skins/classic/css/base/views/console.css b/web/skins/classic/css/base/views/console.css index 1b0e77b4f..d14f44267 100644 --- a/web/skins/classic/css/base/views/console.css +++ b/web/skins/classic/css/base/views/console.css @@ -99,3 +99,6 @@ .StatusFilter select { min-width: 130px; } +#FunctionFunction { + margin-bottom: 2rem; +} diff --git a/web/skins/classic/views/js/console.js b/web/skins/classic/views/js/console.js index 688d0d5ca..46ccd49dc 100644 --- a/web/skins/classic/views/js/console.js +++ b/web/skins/classic/views/js/console.js @@ -151,7 +151,18 @@ function manageFunctionModal(evt) { console.error("Unable to find form with id function_form"); return; } + function_form.elements['newFunction'].onchange=function() { + $j('#function_help div').hide(); + $j('#'+this.value+'Help').show(); + if ( this.value == 'Monitor' || this.value == 'None' ) { + $j('#FunctionEnabled').hide(); + } else { + $j('#FunctionEnabled').show(); + } + }; function_form.elements['newFunction'].value = monitor.Function; + function_form.elements['newFunction'].onchange(); + function_form.elements['newEnabled'].checked = monitor.Enabled == '1'; function_form.elements['mid'].value = mid; document.getElementById('function_monitor_name').innerHTML = monitor.Name; From c65e63798d6473030c68651cb8a1b8af4e1660b7 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 10 Dec 2020 12:09:58 -0500 Subject: [PATCH 19/53] Don't do decode when in RECORD OR NODECT and passthrough and no jpegs --- src/zm_ffmpeg_camera.cpp | 109 +++++++++++++++++++++------------------ 1 file changed, 60 insertions(+), 49 deletions(-) diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp index 7d990bcd2..44ab5964d 100644 --- a/src/zm_ffmpeg_camera.cpp +++ b/src/zm_ffmpeg_camera.cpp @@ -883,7 +883,7 @@ int FfmpegCamera::CaptureAndRecord( AVPacket *avp = queued_packet->av_packet(); // compute time offset between event start and first frame in video - if (packet_count == 0){ + if ( packet_count == 0 ) { monitor->SetVideoWriterStartTime(queued_packet->timestamp); timersub(&queued_packet->timestamp, &recording, &video_offset); Info("Event video offset is %.3f sec (<0 means video starts early)", @@ -912,7 +912,7 @@ int FfmpegCamera::CaptureAndRecord( delete queued_packet; } // end while packets in the packetqueue Debug(2, "Wrote %d queued packets", packet_count); - } + } // end if videostore is open or not } // end if ! was recording } else { @@ -976,63 +976,74 @@ int FfmpegCamera::CaptureAndRecord( } } // end if keyframe or have_video_keyframe - ret = zm_send_packet_receive_frame(mVideoCodecContext, mRawFrame, packet); - if ( ret < 0 ) { - if ( AVERROR(EAGAIN) != ret ) { - Warning("Unable to receive frame %d: code %d %s. error count is %d", - frameCount, ret, av_make_error_string(ret).c_str(), error_count); - error_count += 1; - if ( error_count > 100 ) { - Error("Error count over 100, going to close and re-open stream"); - return -1; - } -#if HAVE_LIBAVUTIL_HWCONTEXT_H -#if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0) - if ( (ret == AVERROR_INVALIDDATA ) && (hw_pix_fmt != AV_PIX_FMT_NONE) ) { - use_hwaccel = false; - return -1; - } -#endif -#endif - } - zm_av_packet_unref(&packet); - continue; - } - if ( error_count > 0 ) error_count--; - zm_dump_video_frame(mRawFrame, "raw frame from decoder"); -#if HAVE_LIBAVUTIL_HWCONTEXT_H -#if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0) if ( - (hw_pix_fmt != AV_PIX_FMT_NONE) - && - (mRawFrame->format == hw_pix_fmt) + ( monitor->GetFunction() == Monitor::RECORD or monitor->GetFunction() == Monitor::NODECT ) + and + ( monitor->GetOptSaveJPEGs() == 0 ) + and + ( monitor->GetOptVideoWriter() == Monitor::H264PASSTHROUGH ) ) { - /* retrieve data from GPU to CPU */ - ret = av_hwframe_transfer_data(hwFrame, mRawFrame, 0); + // In this specific case we don't need to do the decode. + Debug(1, "Not decoding"); + } else { + ret = zm_send_packet_receive_frame(mVideoCodecContext, mRawFrame, packet); if ( ret < 0 ) { - Error("Unable to transfer frame at frame %d: %s, continuing", - frameCount, av_make_error_string(ret).c_str()); + if ( AVERROR(EAGAIN) != ret ) { + Warning("Unable to receive frame %d: code %d %s. error count is %d", + frameCount, ret, av_make_error_string(ret).c_str(), error_count); + error_count += 1; + if ( error_count > 100 ) { + Error("Error count over 100, going to close and re-open stream"); + return -1; + } +#if HAVE_LIBAVUTIL_HWCONTEXT_H +#if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0) + if ( (ret == AVERROR_INVALIDDATA ) && (hw_pix_fmt != AV_PIX_FMT_NONE) ) { + use_hwaccel = false; + return -1; + } +#endif +#endif + } zm_av_packet_unref(&packet); continue; } - zm_dump_video_frame(hwFrame, "After hwtransfer"); - - hwFrame->pts = mRawFrame->pts; - input_frame = hwFrame; - } else { -#endif -#endif - input_frame = mRawFrame; + if ( error_count > 0 ) error_count--; + zm_dump_video_frame(mRawFrame, "raw frame from decoder"); #if HAVE_LIBAVUTIL_HWCONTEXT_H #if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0) - } + if ( + (hw_pix_fmt != AV_PIX_FMT_NONE) + && + (mRawFrame->format == hw_pix_fmt) + ) { + /* retrieve data from GPU to CPU */ + ret = av_hwframe_transfer_data(hwFrame, mRawFrame, 0); + if ( ret < 0 ) { + Error("Unable to transfer frame at frame %d: %s, continuing", + frameCount, av_make_error_string(ret).c_str()); + zm_av_packet_unref(&packet); + continue; + } + zm_dump_video_frame(hwFrame, "After hwtransfer"); + + hwFrame->pts = mRawFrame->pts; + input_frame = hwFrame; + } else { #endif #endif - if ( transfer_to_image(image, mFrame, input_frame) < 0 ) { - Error("Failed to transfer from frame to image"); - zm_av_packet_unref(&packet); - return -1; - } + input_frame = mRawFrame; +#if HAVE_LIBAVUTIL_HWCONTEXT_H +#if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0) + } +#endif +#endif + if ( transfer_to_image(image, mFrame, input_frame) < 0 ) { + Error("Failed to transfer from frame to image"); + zm_av_packet_unref(&packet); + return -1; + } + } // end if don't need to do decode frameComplete = 1; frameCount++; From 7f72d5399f56ce14f70fbbaa1fefb8dbf99e193d Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 10 Dec 2020 14:05:46 -0500 Subject: [PATCH 20/53] add decoding_enabled and DecodingEnabled function --- src/zm_monitor.cpp | 11 ++++++++--- src/zm_monitor.h | 12 ++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp index f85edeaa9..5a01b7879 100644 --- a/src/zm_monitor.cpp +++ b/src/zm_monitor.cpp @@ -71,8 +71,8 @@ // This is the official SQL (and ordering of the fields) to load a Monitor. // It will be used whereever a Monitor dbrow is needed. WHERE conditions can be appended std::string load_monitor_sql = -"SELECT `Id`, `Name`, `ServerId`, `StorageId`, `Type`, `Function`+0, `Enabled`, `LinkedMonitors`, " -"`AnalysisFPSLimit`, `AnalysisUpdateDelay`, `MaxFPS`, `AlarmMaxFPS`," +"SELECT `Id`, `Name`, `ServerId`, `StorageId`, `Type`, `Function`+0, `Enabled`, `DecodingEnabled`, " +"`LinkedMonitors`, `AnalysisFPSLimit`, `AnalysisUpdateDelay`, `MaxFPS`, `AlarmMaxFPS`," "`Device`, `Channel`, `Format`, `V4LMultiBuffer`, `V4LCapturesPerFrame`, " // V4L Settings "`Protocol`, `Method`, `Options`, `User`, `Pass`, `Host`, `Port`, `Path`, `Width`, `Height`, `Colours`, `Palette`, `Orientation`+0, `Deinterlacing`, " "`DecoderHWAccelName`, `DecoderHWAccelDevice`, `RTSPDescribe`, " @@ -282,6 +282,7 @@ Monitor::Monitor( const unsigned int p_storage_id, int p_function, bool p_enabled, + bool p_decoding_enabled, const char *p_linked_monitors, Camera *p_camera, int p_orientation, @@ -326,6 +327,7 @@ Monitor::Monitor( storage_id( p_storage_id ), function( (Function)p_function ), enabled( p_enabled ), + decoding_enabled(p_decoding_enabled), width( (p_orientation==ROTATE_90||p_orientation==ROTATE_270)?p_camera->Height():p_camera->Width() ), height( (p_orientation==ROTATE_90||p_orientation==ROTATE_270)?p_camera->Width():p_camera->Height() ), orientation( (Orientation)p_orientation ), @@ -1861,7 +1863,7 @@ void Monitor::Reload() { static char sql[ZM_SQL_MED_BUFSIZ]; // This seems to have fallen out of date. snprintf(sql, sizeof(sql), - "SELECT `Function`+0, `Enabled`, `LinkedMonitors`, `EventPrefix`, `LabelFormat`, " + "SELECT `Function`+0, `Enabled`, `DecodingEnabled`, `LinkedMonitors`, `EventPrefix`, `LabelFormat`, " "`LabelX`, `LabelY`, `LabelSize`, `WarmupCount`, `PreEventCount`, `PostEventCount`, " "`AlarmFrameCount`, `SectionLength`, `MinSectionLength`, `FrameSkip`, " "`MotionFrameSkip`, `AnalysisFPSLimit`, `AnalysisUpdateDelay`, `MaxFPS`, `AlarmMaxFPS`, " @@ -1877,6 +1879,7 @@ void Monitor::Reload() { int index = 0; function = (Function)atoi(dbrow[index++]); enabled = atoi(dbrow[index++]); + decoding_enabled = atoi(dbrow[index++]); const char *p_linked_monitors = dbrow[index++]; if ( dbrow[index] ) { @@ -2135,6 +2138,7 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zones, Purpose purpose) { std::string type = dbrow[col] ? dbrow[col] : ""; col++; Function function = (Function)atoi(dbrow[col]); col++; int enabled = dbrow[col] ? atoi(dbrow[col]) : 0; col++; + int decoding_enabled = dbrow[col] ? atoi(dbrow[col]) : 0; col++; const char *linked_monitors = dbrow[col];col++; double analysis_fps = dbrow[col] ? strtod(dbrow[col], nullptr) : 0; col++; @@ -2411,6 +2415,7 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zones, Purpose purpose) { storage_id, (int)function, enabled, + decoding_enabled, linked_monitors, camera, orientation, diff --git a/src/zm_monitor.h b/src/zm_monitor.h index e43f1dda0..ed2ce4cbf 100644 --- a/src/zm_monitor.h +++ b/src/zm_monitor.h @@ -378,6 +378,7 @@ public: unsigned int p_storage_id, int p_function, bool p_enabled, + bool p_decoding_enabled, const char *p_linked_monitors, Camera *p_camera, int p_orientation, @@ -445,6 +446,17 @@ public: return false; return enabled; } + inline bool DecodingEnabled() const { + return !( + ( monitor->GetFunction() == Monitor::RECORD or monitor->GetFunction() == Monitor::NODECT ) + and + ( monitor->GetOptSaveJPEGs() == 0 ) + and + ( monitor->GetOptVideoWriter() == Monitor::H264PASSTHROUGH ) + and + !decoding_enabled + ); + } inline const char *EventPrefix() const { return event_prefix; } inline bool Ready() const { if ( function <= MONITOR ) From 7b1ca0e66d45bab1fcb2b44c2c4933783bb7edd6 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 10 Dec 2020 14:05:57 -0500 Subject: [PATCH 21/53] Use the new DecodingEnabled function --- src/zm_ffmpeg_camera.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp index 44ab5964d..ce3386d58 100644 --- a/src/zm_ffmpeg_camera.cpp +++ b/src/zm_ffmpeg_camera.cpp @@ -976,16 +976,7 @@ int FfmpegCamera::CaptureAndRecord( } } // end if keyframe or have_video_keyframe - if ( - ( monitor->GetFunction() == Monitor::RECORD or monitor->GetFunction() == Monitor::NODECT ) - and - ( monitor->GetOptSaveJPEGs() == 0 ) - and - ( monitor->GetOptVideoWriter() == Monitor::H264PASSTHROUGH ) - ) { - // In this specific case we don't need to do the decode. - Debug(1, "Not decoding"); - } else { + if ( monitor->DecodingEnabled() ) { ret = zm_send_packet_receive_frame(mVideoCodecContext, mRawFrame, packet); if ( ret < 0 ) { if ( AVERROR(EAGAIN) != ret ) { From 42ab0987641efd740746e8eb409ca3f428614c85 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 10 Dec 2020 14:06:16 -0500 Subject: [PATCH 22/53] Add DecodingEnabled to Monitors --- db/zm_create.sql.in | 1 + 1 file changed, 1 insertion(+) diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in index fc1a6a552..7af5043f9 100644 --- a/db/zm_create.sql.in +++ b/db/zm_create.sql.in @@ -450,6 +450,7 @@ CREATE TABLE `Monitors` ( `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local', `Function` enum('None','Monitor','Modect','Record','Mocord','Nodect') NOT NULL default 'Monitor', `Enabled` tinyint(3) unsigned NOT NULL default '1', + `DecodingEnabled` tinyint(3) unsigned NOT NULL default '1', `LinkedMonitors` varchar(255), `Triggers` set('X10') NOT NULL default '', `ONVIF_URL` VARCHAR(255) NOT NULL DEFAULT '', From ced396e437638f75149246527c347e84621423d3 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 10 Dec 2020 14:06:26 -0500 Subject: [PATCH 23/53] Add DecodingEnabled to Monitors --- web/includes/Monitor.php | 1 + 1 file changed, 1 insertion(+) diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php index 00735aeda..9b014bec5 100644 --- a/web/includes/Monitor.php +++ b/web/includes/Monitor.php @@ -35,6 +35,7 @@ class Monitor extends ZM_Object { 'Type' => 'Ffmpeg', 'Function' => 'Mocord', 'Enabled' => array('type'=>'boolean','default'=>1), + 'DecodingEnabled' => array('type'=>'boolean','default'=>1), 'LinkedMonitors' => array('type'=>'set', 'default'=>null), 'Triggers' => array('type'=>'set','default'=>''), 'ONVIF_URL' => '', From 4667e21636981c455935f3fd6533ae4743658dd8 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 10 Dec 2020 14:06:40 -0500 Subject: [PATCH 24/53] Add DecodingEnabled to Function modal --- web/ajax/modals/function.php | 12 +++++++++++- web/lang/en_gb.php | 8 +++++++- web/skins/classic/views/js/console.js | 10 ++++++++-- web/skins/classic/views/js/console.js.php | 1 + 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/web/ajax/modals/function.php b/web/ajax/modals/function.php index 44e23b711..08b470840 100644 --- a/web/ajax/modals/function.php +++ b/web/ajax/modals/function.php @@ -50,7 +50,7 @@ if ( !canEdit('Monitors') ) return; ?>
-
+
+
+
+ + +'.$OLANG['FUNCTION_DECODING_ENABLED']['Help'].'
'; + } +?> +
diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php index 9b9979b3b..b7a43db9c 100644 --- a/web/lang/en_gb.php +++ b/web/lang/en_gb.php @@ -1130,7 +1130,13 @@ $OLANG = array( When not enabled no motion detection or linked monitor checking will be performed and no events will be created. The zma process will still be running waiting to be enabled. ' - ) + ), + 'FUNCTION_DECODING_ENABLED' => array( + 'Help' => ' + When in Record or Nodect mode and using H264Passthrough with no jpegs being saved, we can + optionally choose to not decode the H264/H265 packets. This will drastically reduce cpu use + but will make live view unavailable for this monitor.' + ), // 'LANG_DEFAULT' => array( // 'Prompt' => "This is a new prompt for this option", diff --git a/web/skins/classic/views/js/console.js b/web/skins/classic/views/js/console.js index 46ccd49dc..c5f665c3f 100644 --- a/web/skins/classic/views/js/console.js +++ b/web/skins/classic/views/js/console.js @@ -155,15 +155,21 @@ function manageFunctionModal(evt) { $j('#function_help div').hide(); $j('#'+this.value+'Help').show(); if ( this.value == 'Monitor' || this.value == 'None' ) { - $j('#FunctionEnabled').hide(); + $j('#FunctionAnalysisEnabled').hide(); } else { - $j('#FunctionEnabled').show(); + $j('#FunctionAnalysisEnabled').show(); + } + if ( this.value == 'Record' || this.value == 'Nodect' ) { + $j('#FunctionDecodingEnabled').show(); + } else { + $j('#FunctionDecodingEnabled').hide(); } }; function_form.elements['newFunction'].value = monitor.Function; function_form.elements['newFunction'].onchange(); function_form.elements['newEnabled'].checked = monitor.Enabled == '1'; + function_form.elements['newDecodingEnabled'].checked = monitor.DecodingEnabled == '1'; function_form.elements['mid'].value = mid; document.getElementById('function_monitor_name').innerHTML = monitor.Name; diff --git a/web/skins/classic/views/js/console.js.php b/web/skins/classic/views/js/console.js.php index 9f5355dc6..2faf26da5 100644 --- a/web/skins/classic/views/js/console.js.php +++ b/web/skins/classic/views/js/console.js.php @@ -25,6 +25,7 @@ var monitors = new Array(); 'Type': 'Type() ?>', 'Function': 'Function() ?>', 'Enabled': 'Enabled() ?>' + 'DecodingEnabled': 'DecodingEnabled() ?>' }; Date: Thu, 10 Dec 2020 14:08:01 -0500 Subject: [PATCH 25/53] Add missing comma --- web/skins/classic/views/js/console.js.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/js/console.js.php b/web/skins/classic/views/js/console.js.php index 2faf26da5..736d1611f 100644 --- a/web/skins/classic/views/js/console.js.php +++ b/web/skins/classic/views/js/console.js.php @@ -24,7 +24,7 @@ var monitors = new Array(); 'Url': 'UrlToIndex( ZM_MIN_STREAMING_PORT ? ($monitor->Id() + ZM_MIN_STREAMING_PORT) : '') ?>', 'Type': 'Type() ?>', 'Function': 'Function() ?>', - 'Enabled': 'Enabled() ?>' + 'Enabled': 'Enabled() ?>', 'DecodingEnabled': 'DecodingEnabled() ?>' }; Date: Thu, 10 Dec 2020 14:32:17 -0500 Subject: [PATCH 26/53] add Function help text to monitor view --- web/skins/classic/views/js/monitor.js | 13 +++++++++++++ web/skins/classic/views/monitor.php | 21 ++++++++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/web/skins/classic/views/js/monitor.js b/web/skins/classic/views/js/monitor.js index 75cb89707..77876e7c9 100644 --- a/web/skins/classic/views/js/monitor.js +++ b/web/skins/classic/views/js/monitor.js @@ -146,6 +146,19 @@ function initPage() { el.oninput = window['update_estimated_ram_use'].bind(el); }); + document.querySelectorAll('select[name="newMonitor[Function]"]').forEach(function(el) { + el.onchange = function() { + $j('#function_help div').hide(); + $j('#'+this.value+'Help').show(); + if ( this.value == 'Monitor' || this.value == 'None' ) { + $j('#FunctionEnabled').hide(); + } else { + $j('#FunctionEnabled').show(); + } + }; + el.onchange(); + }); + $j('.chosen').chosen(); // Don't enable the back button if there is no previous zm page to go back to diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php index aae5bddf1..5bfc03ecc 100644 --- a/web/skins/classic/views/monitor.php +++ b/web/skins/classic/views/monitor.php @@ -470,7 +470,7 @@ if ( canEdit('Monitors') ) {
$value ) { - echo '
'; + echo '
'; ?> @@ -512,11 +512,26 @@ switch ( $name ) { } echo htmlSelect('newMonitor[Function]', $function_options, $monitor->Function()); ?> +
+ $translated ) { + if ( isset($OLANG['FUNCTION_'.strtoupper($fn)]) ) { + echo '
'.$OLANG['FUNCTION_'.strtoupper($fn)]['Help'].'
'; + } + } +?> +
- + - + Type() != 'WebSite' ) { From 2e9f991211c15a134efe0680dab51877bd748afe Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 10 Dec 2020 14:32:44 -0500 Subject: [PATCH 27/53] give the label column in monitor view a min-width of 300px so that it is always large enough --- web/skins/classic/css/base/views/monitor.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/skins/classic/css/base/views/monitor.css b/web/skins/classic/css/base/views/monitor.css index 2cdc0c400..29af3612a 100644 --- a/web/skins/classic/css/base/views/monitor.css +++ b/web/skins/classic/css/base/views/monitor.css @@ -42,3 +42,6 @@ input[name="newMonitor[Height]"] { select.chosen { width: 100%; } +tr td:first-child { + min-width: 300px; +} From 06ecb3ccb1cf76eb6e04e133d2ac90533f58ccc4 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 10 Dec 2020 14:39:14 -0500 Subject: [PATCH 28/53] Add update script to add DecodeEnabled --- db/zm_update-1.35.16.sql | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 db/zm_update-1.35.16.sql diff --git a/db/zm_update-1.35.16.sql b/db/zm_update-1.35.16.sql new file mode 100644 index 000000000..50c952bca --- /dev/null +++ b/db/zm_update-1.35.16.sql @@ -0,0 +1,12 @@ + +SET @s = (SELECT IF( + (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE() + AND table_name = 'Monitors' + AND column_name = 'DecodingEnabled' + ) > 0, + "SELECT 'Column DecodingEnabled already exists in Monitors'", + "ALTER TABLE Monitors ADD `DecodingEnabled` tinyint(3) unsigned NOT NULL default '1' AFTER `Enabled`" + )); + +PREPARE stmt FROM @s; +EXECUTE stmt; From eb00cf405af7782709880892e57727e6f8de99f4 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 10 Dec 2020 15:14:37 -0500 Subject: [PATCH 29/53] Add DecodingEnabled to monitor view --- web/skins/classic/views/monitor.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php index aae5bddf1..8af0f1238 100644 --- a/web/skins/classic/views/monitor.php +++ b/web/skins/classic/views/monitor.php @@ -502,6 +502,9 @@ switch ( $name ) { +Type() != 'WebSite' ) { +?> - + + + + Type() != 'WebSite' ) { + if ( isset($OLANG['FUNCTION_DECODING_ENABLED']) ) { + echo '
'.$OLANG['FUNCTION_DECODING_ENABLED']['Help'].'
'; + } ?> + + - + From f89da79c277c0df908be43efaea76e1d69279d05 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 10 Dec 2020 16:25:24 -0500 Subject: [PATCH 34/53] Fix comparing empty arrays. explode on an empty string returns an array with a single element '' instead of an empty array --- web/includes/Object.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/includes/Object.php b/web/includes/Object.php index 148cb2bd3..5b630a1a7 100644 --- a/web/includes/Object.php +++ b/web/includes/Object.php @@ -250,8 +250,8 @@ class ZM_Object { } else if ( property_exists($this, $field) ) { $type = (array_key_exists($field, $this->defaults) && is_array($this->defaults[$field])) ? $this->defaults[$field]['type'] : 'scalar'; if ( $type == 'set' ) { - $old_value = is_array($this->$field) ? $this->$field : explode(',', $this->$field); - $new_value = is_array($value) ? $value : explode(',', $value); + $old_value = is_array($this->$field) ? $this->$field : ($this->$field ? explode(',', $this->$field) : array()); + $new_value = is_array($value) ? $value : ($value ? explode(',', $value) : array()); $diff = array_recursive_diff($old_value, $new_value); if ( count($diff) ) { From bfd16db34bc462b2abb06f10c723ef5ef77fa5fe Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 11 Dec 2020 09:33:36 -0500 Subject: [PATCH 35/53] add format padding so that right align file size strings will line up nicely. --- web/includes/functions.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/includes/functions.php b/web/includes/functions.php index c2072a706..fe7d2ae77 100644 --- a/web/includes/functions.php +++ b/web/includes/functions.php @@ -2149,14 +2149,15 @@ function folder_size($dir) { } // end function folder_size function human_filesize($size, $precision = 2) { - $units = array('B','kB','MB','GB','TB','PB','EB','ZB','YB'); + $units = array('B ','kB','MB','GB','TB','PB','EB','ZB','YB'); $step = 1024; $i = 0; while (($size / $step) > 0.9) { $size = $size / $step; $i++; } - return round($size, $precision).$units[$i]; + # The idea is that we can right align this and have the digits columns line up nicely. + return sprintf('%.'.$precision.'f', round($size, $precision)).$units[$i]; } function csrf_startup() { From 77a35c18139da91426f1b2d8d19f320a9047219f Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 11 Dec 2020 09:33:54 -0500 Subject: [PATCH 36/53] right align colDiskSpace so that digits line up nicely --- web/skins/classic/css/base/skin.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/skins/classic/css/base/skin.css b/web/skins/classic/css/base/skin.css index 217364152..f75ea26c6 100644 --- a/web/skins/classic/css/base/skin.css +++ b/web/skins/classic/css/base/skin.css @@ -741,3 +741,6 @@ a.flip { float: right; margin-right: -20px; } +#content table.major .colDiskSpace { + text-align: right; +} From 3483ee8db104cbabce76b5bb2f34e9ea822d9ec4 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 11 Dec 2020 09:34:50 -0500 Subject: [PATCH 37/53] clean up code a little by make an event_link string and using it. Fix the cause column not being a valid link. I think it used to popup an edit but it should just go to the event view --- web/skins/classic/views/export.php | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/web/skins/classic/views/export.php b/web/skins/classic/views/export.php index e234402f4..c9aef58a7 100644 --- a/web/skins/classic/views/export.php +++ b/web/skins/classic/views/export.php @@ -143,21 +143,22 @@ $event_count = 0; while ( $event_row = dbFetchNext($results) ) { $event = new ZM\Event($event_row); $scale = max(reScale(SCALE_BASE, $event->Monitor()->DefaultScale(), ZM_WEB_DEFAULT_SCALE), SCALE_BASE); + $event_link = '?view=event&eid='.$event->Id().$filterQuery.$sortQuery.'&page=1'; ?> Archived() ? ' class="archived"' : '' ?>> - - - + + + - - - + + + @@ -168,9 +169,7 @@ while ( $event_row = dbFetchNext($results) ) { echo ''; } unset($event); - echo ' - -'; + echo PHP_EOL.''.PHP_EOL; } # end foreach event ?> @@ -179,9 +178,7 @@ while ( $event_row = dbFetchNext($results) ) { - -'.human_filesize($disk_space_total).''.PHP_EOL; } ?> From c26fc1f36a215a6f8da773eb90abffa9644d230c Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 11 Dec 2020 09:42:35 -0500 Subject: [PATCH 38/53] Replace thisUrl with the export ajax request as a GET parameter, making it easier to find inlogs. --- web/skins/classic/views/js/export.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/web/skins/classic/views/js/export.js b/web/skins/classic/views/js/export.js index 01bb3de3c..264000ac5 100644 --- a/web/skins/classic/views/js/export.js +++ b/web/skins/classic/views/js/export.js @@ -64,12 +64,10 @@ function exportResponse(respObj, respText) { } function exportEvents( ) { - var parms = 'view=event&request=event&action=export'; - parms += '&'+$('contentForm').toQueryString(); var query = new Request.JSON( { - url: thisUrl, + url: '?view=event&request=event&action=export', method: 'post', - data: parms, + data: $('contentForm').toQueryString(), onSuccess: exportResponse } ); query.send(); From 51a862057f340df8e883043b806db66d77916b8f Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 11 Dec 2020 09:49:43 -0500 Subject: [PATCH 39/53] Fix a link missing a quote --- web/skins/classic/views/export.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/skins/classic/views/export.php b/web/skins/classic/views/export.php index c9aef58a7..cddd8cb29 100644 --- a/web/skins/classic/views/export.php +++ b/web/skins/classic/views/export.php @@ -152,10 +152,9 @@ while ( $event_row = dbFetchNext($results) ) { - + +( $event->EndDateTime() ? ' until ' . strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->EndDateTime())) : '' ) ?> From 2f0df74c547c4d2e5038d7b85b4956c083a98f39 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Sat, 12 Dec 2020 11:37:50 -0600 Subject: [PATCH 40/53] show the analyse image in frames view if it exists --- web/ajax/frames.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/web/ajax/frames.php b/web/ajax/frames.php index e85988dbc..e129200e7 100644 --- a/web/ajax/frames.php +++ b/web/ajax/frames.php @@ -161,15 +161,30 @@ function queryRequest($eid, $search, $advsearch, $sort, $offset, $order, $limit) $returned_rows = array(); foreach ( array_slice($filtered_rows, $offset, $limit) as $row ) { if ( ZM_WEB_LIST_THUMBS ) { + + # Build the path to the potential analysis image + $analImage = sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d-analyse.jpg', $row['FrameId']); + $analPath = $Event->Path().'/'.$analImage; + $alarmFrame = $row['Type'] == 'Alarm'; + $hasAnalImage = $alarmFrame && file_exists($analPath) && filesize($analPath); + + # Our base img source component, which we will add on to $base_img_src = '?view=image&fid=' .$row['Id']; + + # if an analysis images exists, use it as the thumbnail + if ( $hasAnalImage ) $base_img_src .= '&show=analyse'; + + # Build the subcomponents needed for the image source $ratio_factor = $Monitor->ViewHeight() / $Monitor->ViewWidth(); $thmb_width = ZM_WEB_LIST_THUMB_WIDTH ? 'width='.ZM_WEB_LIST_THUMB_WIDTH : ''; $thmb_height = 'height="'.( ZM_WEB_LIST_THUMB_HEIGHT ? ZM_WEB_LIST_THUMB_HEIGHT : ZM_WEB_LIST_THUMB_WIDTH*$ratio_factor ) .'"'; $thmb_fn = 'filename=' .$Event->MonitorId(). '_' .$row['EventId']. '_' .$row['FrameId']. '.jpg'; + + # Assemble the scaled and unscaled image source image source components $img_src = join('&', array_filter(array($base_img_src, $thmb_width, $thmb_height, $thmb_fn))); $full_img_src = join('&', array_filter(array($base_img_src, $thmb_fn))); - $frame_src = '?view=frame&eid=' .$row['EventId']. '&fid=' .$row['FrameId']; + # finally, we assemble the the entire thumbnail img src structure, whew $row['Thumbnail'] = ''; } $returned_rows[] = $row; From 237335c02289fdae33be1724e2f16e82f591bf3e Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Sat, 12 Dec 2020 12:45:36 -0600 Subject: [PATCH 41/53] watch.js - finish mootools replacement --- web/skins/classic/views/js/watch.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js index 1fe53744e..2773a2421 100644 --- a/web/skins/classic/views/js/watch.js +++ b/web/skins/classic/views/js/watch.js @@ -648,7 +648,7 @@ function controlCmd(event) { controlReq(data); if ( streamMode == 'single' ) { - fetchImage.pass($('imageFeed').getElement('img')).delay(1000); + setTimeout(fetchImage, 1000, $j('#imageFeed img')); } } @@ -662,12 +662,12 @@ function controlCmdImage( x, y ) { controlReq(data); if ( streamMode == 'single' ) { - fetchImage.pass( $('imageFeed').getElement('img') ).delay( 1000 ); + setTimeout(fetchImage, 1000, $j('#imageFeed img')); } } function fetchImage( streamImage ) { - streamImage.src = streamImage.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) )); + streamImage.attr('src', streamImage.attr('src').replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ))); } function handleClick( event ) { @@ -824,25 +824,25 @@ function initPage() { if ( monitorType != 'WebSite' ) { if ( streamMode == 'single' ) { statusCmdTimer = statusCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout ); - watchdogCheck.pass('status').periodical(statusRefreshTimeout*2); + setInterval(watchdogCheck, statusRefreshTimeout*2, 'status'); } else { streamCmdTimer = streamCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout ); - watchdogCheck.pass('stream').periodical(statusRefreshTimeout*2); + setInterval(watchdogCheck, statusRefreshTimeout*2, 'stream'); } if ( canStreamNative || (streamMode == 'single') ) { - var streamImg = $('imageFeed').getElement('img'); + var streamImg = $j('#imageFeed img'); if ( !streamImg ) { - streamImg = $('imageFeed').getElement('object'); + streamImg = $j('#imageFeed object'); } if ( !streamImg ) { console.error('No streamImg found for imageFeed'); } else { if ( streamMode == 'single' ) { - streamImg.addEvent('click', fetchImage.pass(streamImg)); - fetchImage.pass(streamImg).periodical(imageRefreshTimeout); + streamImg.click(streamImg, fetchImage); + setInterval(fetchImage, imageRefreshTimeout, $j('#imageFeed img')); } else { - streamImg.addEvent('click', function(event) { + streamImg.click(function(event) { handleClick(event); }); } From 71d1607f69c0abae37ff8ee650f269be8a46c164 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Sat, 12 Dec 2020 15:06:59 -0600 Subject: [PATCH 42/53] fix php -> js issue when $alarmframe was false --- web/skins/classic/views/frame.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/frame.php b/web/skins/classic/views/frame.php index dc9ef9c4f..c3fd22ccf 100644 --- a/web/skins/classic/views/frame.php +++ b/web/skins/classic/views/frame.php @@ -49,7 +49,7 @@ $prevFid = $fid-1; $nextFid = $fid+1; $lastFid = $maxFid; -$alarmFrame = $Frame->Type() == 'Alarm'; +$alarmFrame = ( $Frame->Type() == 'Alarm' ) ? 1 : 0; if ( isset($_REQUEST['scale']) ) { $scale = validNum($_REQUEST['scale']); From c24564e0cdd33e8e3e00770bb8d5dba32945dfce Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Sun, 13 Dec 2020 13:20:26 -0600 Subject: [PATCH 43/53] insert frame stats into frame view --- web/ajax/stats.php | 25 +++++++++++++++++++++++-- web/skins/classic/views/frame.php | 10 +++++++++- web/skins/classic/views/js/frame.js | 21 +++++++++++++++++++++ web/skins/classic/views/js/frame.js.php | 12 ++++++++++++ 4 files changed, 65 insertions(+), 3 deletions(-) diff --git a/web/ajax/stats.php b/web/ajax/stats.php index 3789ff448..06ce9d733 100644 --- a/web/ajax/stats.php +++ b/web/ajax/stats.php @@ -6,6 +6,7 @@ if ( empty($_REQUEST['fid']) ) ajaxError('Frame Id Not Provided'); $eid = $_REQUEST['eid']; $fid = $_REQUEST['fid']; $row = ( isset($_REQUEST['row']) ) ? $_REQUEST['row'] : ''; +$raw = isset($_REQUEST['raw']); $data = array(); // Not sure if this is required @@ -16,8 +17,28 @@ if ( ZM_OPT_USE_AUTH && (ZM_AUTH_RELAY == 'hashed') ) { } } -$data['html'] = getStatsTableHTML($eid, $fid, $row); -$data['id'] = '#contentStatsTable' .$row; +if ( $raw ) { + $sql = 'SELECT S.*,E.*,Z.Name AS ZoneName,Z.Units,Z.Area,M.Name AS MonitorName FROM Stats AS S LEFT JOIN Events AS E ON S.EventId = E.Id LEFT JOIN Zones AS Z ON S.ZoneId = Z.Id LEFT JOIN Monitors AS M ON E.MonitorId = M.Id WHERE S.EventId = ? AND S.FrameId = ? ORDER BY S.ZoneId'; + $stat = dbFetchOne( $sql, NULL, array( $eid, $fid ) ); + if ( $stat ) { + $stat['ZoneName'] = validHtmlStr($stat['ZoneName']); + $stat['PixelDiff'] = validHtmlStr($stat['PixelDiff']); + $stat['AlarmPixels'] = sprintf( "%d (%d%%)", $stat['AlarmPixels'], (100*$stat['AlarmPixels']/$stat['Area']) ); + $stat['FilterPixels'] = sprintf( "%d (%d%%)", $stat['FilterPixels'], (100*$stat['FilterPixels']/$stat['Area']) ); + $stat['BlobPixels'] = sprintf( "%d (%d%%)", $stat['BlobPixels'], (100*$stat['BlobPixels']/$stat['Area']) ); + $stat['Blobs'] = validHtmlStr($stat['Blobs']); + if ( $stat['Blobs'] > 1 ) { + $stat['BlobSizes'] = sprintf( "%d-%d (%d%%-%d%%)", $stat['MinBlobSize'], $stat['MaxBlobSize'], (100*$stat['MinBlobSize']/$stat['Area']), (100*$stat['MaxBlobSize']/$stat['Area']) ); + } else { + $stat['BlobSizes'] = sprintf( "%d (%d%%)", $stat['MinBlobSize'], 100*$stat['MinBlobSize']/$stat['Area'] ); + } + $stat['AlarmLimits'] = validHtmlStr($stat['MinX'].",".$stat['MinY']."-".$stat['MaxX'].",".$stat['MaxY']); + } + $data['raw'] = $stat; +} else { + $data['html'] = getStatsTableHTML($eid, $fid, $row); + $data['id'] = '#contentStatsTable' .$row; +} ajaxResponse($data); return; diff --git a/web/skins/classic/views/frame.php b/web/skins/classic/views/frame.php index c3fd22ccf..7895810d4 100644 --- a/web/skins/classic/views/frame.php +++ b/web/skins/classic/views/frame.php @@ -103,7 +103,14 @@ xhtmlHeaders(__FILE__, translate('Frame').' - '.$Event->Id().' - '.$Frame->Frame -
+
+ + +
Enabled() ? ' checked="checked"' : '' ?>/>Enabled() ? ' checked="checked"' : '' ?>/> +'.$OLANG['FUNCTION_ANALYSIS_ENABLED']['Help'].''; + } +?> +
Type()); ?>
@@ -515,12 +518,19 @@ switch ( $name ) {
Enabled() ? ' checked="checked"' : '' ?>/>
From f77292e6ccac9dbdeb3c8dfb216435a0a7664f26 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 10 Dec 2020 16:23:08 -0500 Subject: [PATCH 30/53] Move the decoding_enabled logic to constructor to save a few cycles --- src/zm_monitor.cpp | 14 +++++++++++++- src/zm_monitor.h | 11 ++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp index 5a01b7879..51b8ba12a 100644 --- a/src/zm_monitor.cpp +++ b/src/zm_monitor.cpp @@ -463,6 +463,18 @@ Monitor::Monitor( exit(-1); } + // Do this here to save a few cycles with all the comparisons + decoding_enabled = !( + ( function == RECORD or function == NODECT ) + and + ( savejpegs == 0 ) + and + ( videowriter == H264PASSTHROUGH ) + and + !decoding_enabled + ); + Debug(1, "Decoding enabled: %d", decoding_enabled); + memset(mem_ptr, 0, mem_size); shared_data->size = sizeof(SharedData); shared_data->active = enabled; @@ -1874,7 +1886,7 @@ void Monitor::Reload() { if ( !row ) { Error("Can't run query: %s", mysql_error(&dbconn)); return; - } + } if ( MYSQL_ROW dbrow = row->mysql_row() ) { int index = 0; function = (Function)atoi(dbrow[index++]); diff --git a/src/zm_monitor.h b/src/zm_monitor.h index ed2ce4cbf..2900af743 100644 --- a/src/zm_monitor.h +++ b/src/zm_monitor.h @@ -253,6 +253,7 @@ protected: CameraType type; Function function; // What the monitor is doing bool enabled; // Whether the monitor is enabled or asleep + bool decoding_enabled; // Whether the monitor will decode h264/h265 packets unsigned int width; // Normally the same as the camera, but not if partly rotated unsigned int height; // Normally the same as the camera, but not if partly rotated bool v4l_multi_buffer; @@ -447,15 +448,7 @@ public: return enabled; } inline bool DecodingEnabled() const { - return !( - ( monitor->GetFunction() == Monitor::RECORD or monitor->GetFunction() == Monitor::NODECT ) - and - ( monitor->GetOptSaveJPEGs() == 0 ) - and - ( monitor->GetOptVideoWriter() == Monitor::H264PASSTHROUGH ) - and - !decoding_enabled - ); + return decoding_enabled; } inline const char *EventPrefix() const { return event_prefix; } inline bool Ready() const { From da8d96dddac52582333c7fa0ce6c537bf3445977 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 10 Dec 2020 16:24:09 -0500 Subject: [PATCH 31/53] Don't pass types to changes, it doesn't do anything. Add DecodingEnabled to request --- web/includes/actions/monitor.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/includes/actions/monitor.php b/web/includes/actions/monitor.php index be17578cf..80f9083af 100644 --- a/web/includes/actions/monitor.php +++ b/web/includes/actions/monitor.php @@ -55,6 +55,7 @@ if ( $action == 'save' ) { 'Controllable' => 0, 'TrackMotion' => 0, 'Enabled' => 0, + 'DecodingEnabled' => 0, 'Exif' => 0, 'RTSPDescribe' => 0, 'V4LMultiBuffer' => '', @@ -82,7 +83,7 @@ if ( $action == 'save' ) { } } - $changes = $monitor->changes($_REQUEST['newMonitor'], $types); + $changes = $monitor->changes($_REQUEST['newMonitor']); $restart = false; if ( count($changes) ) { From c37433acfcb90f6c7692f5b2cbb3c657081318f1 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 10 Dec 2020 16:24:33 -0500 Subject: [PATCH 32/53] show/hide DecodingEnabled depending on function --- web/skins/classic/views/js/monitor.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/skins/classic/views/js/monitor.js b/web/skins/classic/views/js/monitor.js index 77876e7c9..ae6abacb0 100644 --- a/web/skins/classic/views/js/monitor.js +++ b/web/skins/classic/views/js/monitor.js @@ -155,6 +155,11 @@ function initPage() { } else { $j('#FunctionEnabled').show(); } + if ( this.value == 'Record' || this.value == 'Nodect' ) { + $j('#FunctionDecodingEnabled').show(); + } else { + $j('#FunctionDecodingEnabled').hide(); + } }; el.onchange(); }); From 8bda0b550474852c87525ab7b9ec4dab7329e995 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 10 Dec 2020 16:24:45 -0500 Subject: [PATCH 33/53] fix element name on DecodingEnabled --- web/skins/classic/views/monitor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php index 740a1d7ba..3b854f4fe 100644 --- a/web/skins/classic/views/monitor.php +++ b/web/skins/classic/views/monitor.php @@ -538,13 +538,13 @@ switch ( $name ) {
DecodingEnabled() ? ' checked="checked"' : '' ?>/> '.$OLANG['FUNCTION_DECODING_ENABLED']['Help'].''; } ?> - +
- Id().($event->Archived()?'*':'') ?> + Id().($event->Archived()?'*':'') ?> Name()).($event->Archived()?'*':'') ?>MonitorId(), $event->MonitorName(), canEdit( 'Monitors' ) ) ?>Cause()), canEdit( 'Events' ), 'title="' .htmlspecialchars($event->Notes()). '" class="eDetailLink" data-eid=' .$event->Id(). '"') ?>Name()).($event->Archived()?'*':'') ?>MonitorId(), $event->MonitorName(), canEdit('Monitors')) ?>Cause()), canEdit('Events'), 'title="' .htmlspecialchars($event->Notes()). '" class="eDetailLink" data-eid=' .$event->Id(). '"') ?> StartDateTime())) . -( $event->EndDateTime() ? ' until ' . strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->EndDateTime()) ) : '' ) ?> +( $event->EndDateTime() ? ' until ' . strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->EndDateTime())) : '' ) ?> Length() ) ?>Id(), $event->Frames() ) ?>Id(), $event->AlarmFrames() ) ?>Length()) ?>Id(), $event->Frames()) ?>Id(), $event->AlarmFrames()) ?> TotScore() ?> AvgScore() ?> MaxScore() ?>'.human_filesize($event->DiskSpace()).'
events
Name()).($event->Archived()?'*':'') ?> MonitorId(), $event->MonitorName(), canEdit('Monitors')) ?>Cause()), canEdit('Events'), 'title="' .htmlspecialchars($event->Notes()). '" class="eDetailLink" data-eid=' .$event->Id(). '"') ?>Cause()), canView('Events'), 'title="' .htmlspecialchars($event->Notes()). '" class="eDetailLink" data-eid="'.$event->Id().'"') ?> StartDateTime())) . -( $event->EndDateTime() ? ' until ' . strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->EndDateTime())) : '' ) ?> - Length()) ?> Id(), $event->Frames()) ?> Id(), $event->AlarmFrames()) ?>
+ +
+ +

', $Event->Id(), $Frame->FrameId(), $scale, ( $show=='anal'?'capt':'anal' ) ); @@ -152,6 +159,7 @@ if ( file_exists($rImagePath) ) { class="" />

+
diff --git a/web/skins/classic/views/js/frame.js b/web/skins/classic/views/js/frame.js index e91796f6a..a5cab581e 100644 --- a/web/skins/classic/views/js/frame.js +++ b/web/skins/classic/views/js/frame.js @@ -40,6 +40,24 @@ document.addEventListener('DOMContentLoaded', function onDCL() { document.getElementById('scaleControl').addEventListener('change', changeScale); }); +function getStat(params) { + $j.getJSON(thisUrl + '?view=request&request=stats&raw=true', params) + .done(function(data) { + var stat = data.raw; + + $j('#frameStatsTable').empty().append(''); + $j.each( statHeaderStrings, function( key ) { + var th = $j('').addClass('text-right').text(statHeaderStrings[key]); + var tdString = ( stat ) ? stat[key] : 'n/a'; + var td = $j('').text(tdString); + var row = $j('').append(th, td); + + $j('#frameStatsTable tbody').append(row); + }); + }) + .fail(logAjaxFail); +} + function initPage() { var backBtn = $j('#backBtn'); @@ -65,6 +83,9 @@ function initPage() { evt.preventDefault(); window.location.href = thisUrl+'?view=stats&eid='+eid+'&fid='+fid; }); + + // Load the frame stats + getStat({eid:eid, fid:fid}); } $j(document).ready(function() { diff --git a/web/skins/classic/views/js/frame.js.php b/web/skins/classic/views/js/frame.js.php index 9bd2f4236..bf1c237c7 100644 --- a/web/skins/classic/views/js/frame.js.php +++ b/web/skins/classic/views/js/frame.js.php @@ -13,3 +13,15 @@ var eid = ; var fid = ; var record_event_stats = ; var alarmFrame = ; + +var statHeaderStrings = {}; +statHeaderStrings.ZoneName = ""; +statHeaderStrings.PixelDiff = ""; +statHeaderStrings.AlarmPixels = ""; +statHeaderStrings.FilterPixels = ""; +statHeaderStrings.BlobPixels = ""; +statHeaderStrings.Blobs = ""; +statHeaderStrings.BlobSizes = ""; +statHeaderStrings.AlarmLimits = ""; +statHeaderStrings.Score = ""; + From 882447317a087c0d849609f3ba9915331e47fbdd Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Sun, 13 Dec 2020 14:42:39 -0600 Subject: [PATCH 44/53] eslint --- web/skins/classic/views/js/frame.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/skins/classic/views/js/frame.js b/web/skins/classic/views/js/frame.js index a5cab581e..dc66cd80f 100644 --- a/web/skins/classic/views/js/frame.js +++ b/web/skins/classic/views/js/frame.js @@ -84,8 +84,8 @@ function initPage() { window.location.href = thisUrl+'?view=stats&eid='+eid+'&fid='+fid; }); - // Load the frame stats - getStat({eid:eid, fid:fid}); + // Load the frame stats + getStat({eid: eid, fid: fid}); } $j(document).ready(function() { From 48c63093943732e890bc7ebb9787985b4a79266c Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Sun, 13 Dec 2020 15:01:47 -0600 Subject: [PATCH 45/53] add emailed & archived status to event view --- web/skins/classic/views/event.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php index 08ad9eacb..ee49f5841 100644 --- a/web/skins/classic/views/event.php +++ b/web/skins/classic/views/event.php @@ -221,6 +221,14 @@ if ( !$Event->Id() ) { + + + Archived ? translate('Yes') : translate('No') ?> + + + + Emailed ? translate('Yes') : translate('No') ?> +
From 43d0b0fd558fddcd3976c3f02888326bc51bf8f6 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 11 Dec 2020 11:43:17 -0500 Subject: [PATCH 46/53] Add D1-PAL resolution --- web/skins/classic/views/monitor.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php index 3b854f4fe..814ea4333 100644 --- a/web/skins/classic/views/monitor.php +++ b/web/skins/classic/views/monitor.php @@ -850,11 +850,13 @@ include('_monitor_source_nvsocket.php'); '320x240'=>'320x240', '320x200'=>'320x200', '352x240'=>'352x240 CIF', + '352x480'=>'352x480', '640x480'=>'640x480', '640x400'=>'640x400', '704x240'=>'704x240 2CIF', '704x480'=>'704x480 4CIF', '720x480'=>'720x480 D1', + '720x576'=>'720x576 D1 PAL', '1280x720'=>'1280x720 720p', '1280x800'=>'1280x800', '1280x960'=>'1280x960 960p', From 4ae47659df0487e9959392be217b59e86c989303 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Sun, 13 Dec 2020 21:19:38 -0600 Subject: [PATCH 47/53] use js to build event stats --- web/skins/classic/views/event.php | 69 +------------------------ web/skins/classic/views/js/event.js | 15 ++++++ web/skins/classic/views/js/event.js.php | 33 ++++++++++-- 3 files changed, 46 insertions(+), 71 deletions(-) diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php index ee49f5841..6e98edf73 100644 --- a/web/skins/classic/views/event.php +++ b/web/skins/classic/views/event.php @@ -131,8 +131,6 @@ if ( !$Event->Id() ) { } else { if ( !file_exists($Event->Path()) ) echo '
Event was not found at '.$Event->Path().'. It is unlikely that playback will be possible.
'; - - $storage = validHtmlStr($Event->Storage()->Name()).( $Event->SecondaryStorageId() ? ', '.validHtmlStr($Event->SecondaryStorage()->Name()) : '' ); ?> @@ -164,72 +162,7 @@ if ( !$Event->Id() ) {
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
Id() ?>
Name() ?>
Id() ?>
Name()) ?>
Cause()) ?>
StartDateTime())) ?>
Length().'s' ?>
Frames() ?>
AlarmFrames() ?>
TotScore() ?>
AvgScore() ?>
MaxScore() ?>
DiskSpace(null)) ?>
Archived ? translate('Yes') : translate('No') ?>
Emailed ? translate('Yes') : translate('No') ?>
diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js index 37ef5966c..21dfd49eb 100644 --- a/web/skins/classic/views/js/event.js +++ b/web/skins/classic/views/js/event.js @@ -1075,10 +1075,25 @@ function getEvtStatsCookie() { return stats; } +function getStat() { + table.empty().append(''); + $j.each( eventDataStrings, function( key ) { + var th = $j('').addClass('text-right').text(eventDataStrings[key]); + var tdString = ( eventData ) ? eventData[key] : 'n/a'; + var td = $j('').text(tdString); + var row = $j('').append(th, td); + + $j('#eventStatsTable tbody').append(row); + }); +} + function initPage() { // Load the delete confirmation modal into the DOM getDelConfirmModal(); + // Load the event stats + getStat(); + var stats = getEvtStatsCookie(); if ( stats != 'on' ) table.toggle(false); diff --git a/web/skins/classic/views/js/event.js.php b/web/skins/classic/views/js/event.js.php index 05d9f5ffb..6c0504ea6 100644 --- a/web/skins/classic/views/js/event.js.php +++ b/web/skins/classic/views/js/event.js.php @@ -42,17 +42,44 @@ var eventData = { Id: 'Id() ?>', Name: 'Name() ?>', MonitorId: 'MonitorId() ?>', + MonitorName: 'Name()) ?>', + Cause: 'Cause()) ?>', Width: 'Width() ?>', Height: 'Height() ?>', Length: 'Length() ?>', StartDateTime: 'StartDateTime() ?>', + StartDateTimeFmt: 'StartDateTime())) ?>', EndDateTime: 'EndDateTime() ?>', Frames: 'Frames() ?>', - MonitorName: 'Name()) ?>', + AlarmFrames: 'AlarmFrames() ?>', + TotScore: 'TotScore() ?>', + AvgScore: 'AvgScore() ?>', + MaxScore: 'MaxScore() ?>', DiskSpace: 'DiskSpace(null)) ?>', - Storage: 'Storage()->Name()).( $Event->SecondaryStorageId() ? ', '.validHtmlStr($Event->SecondaryStorage()->Name()) : '' ) ?>', - Archived: Archived?'true':'false' ?> + Storage: 'Storage()->Name()).( $Event->SecondaryStorageId() ? ', '.validHtmlStr($Event->SecondaryStorage()->Name()) : '' ) ?>', + Archived: 'Archived ? translate('Yes') : translate('No') ?>', + Emailed: 'Emailed ? translate('Yes') : translate('No') ?>' }; + +var eventDataStrings = { + Id: '', + Name: '', + MonitorId: '', + MonitorName: '', + Cause: '', + StartDateTimeFmt: '', + Length: '', + Frames: '', + AlarmFrames: '', + TotScore: '', + AvgScore: '', + MaxScore: '', + DiskSpace: '', + Storage: '', + Archived: '', + Emailed: '' +}; + var monitorUrl = 'Storage()->Server()->UrlToIndex(); ?>'; var filterQuery = ''; From a5b945f97a8c11bd89acb672fb738cb7124fa51c Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Mon, 14 Dec 2020 06:55:45 -0600 Subject: [PATCH 48/53] touch up event view stat list --- web/skins/classic/views/event.php | 2 +- web/skins/classic/views/js/event.js | 2 +- web/skins/classic/views/js/event.js.php | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php index 6e98edf73..e50624a4d 100644 --- a/web/skins/classic/views/event.php +++ b/web/skins/classic/views/event.php @@ -162,7 +162,7 @@ if ( !$Event->Id() ) {
- +
diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js index 21dfd49eb..6c96af62e 100644 --- a/web/skins/classic/views/js/event.js +++ b/web/skins/classic/views/js/event.js @@ -1079,7 +1079,7 @@ function getStat() { table.empty().append(''); $j.each( eventDataStrings, function( key ) { var th = $j('').addClass('text-right').text(eventDataStrings[key]); - var tdString = ( eventData ) ? eventData[key] : 'n/a'; + var tdString = ( eventData[key].length ) ? eventData[key] : 'n/a'; var td = $j('').text(tdString); var row = $j('').append(th, td); diff --git a/web/skins/classic/views/js/event.js.php b/web/skins/classic/views/js/event.js.php index 6c0504ea6..989682296 100644 --- a/web/skins/classic/views/js/event.js.php +++ b/web/skins/classic/views/js/event.js.php @@ -57,8 +57,10 @@ var eventData = { MaxScore: 'MaxScore() ?>', DiskSpace: 'DiskSpace(null)) ?>', Storage: 'Storage()->Name()).( $Event->SecondaryStorageId() ? ', '.validHtmlStr($Event->SecondaryStorage()->Name()) : '' ) ?>', - Archived: 'Archived ? translate('Yes') : translate('No') ?>', - Emailed: 'Emailed ? translate('Yes') : translate('No') ?>' + ArchivedStr: 'Archived ? translate('Yes') : translate('No') ?>', + EmailedStr: 'Emailed ? translate('Yes') : translate('No') ?>', + Archived: Archived?'true':'false' ?>, + Emailed: Emailed?'true':'false' ?> }; var eventDataStrings = { @@ -76,8 +78,8 @@ var eventDataStrings = { MaxScore: '', DiskSpace: '', Storage: '', - Archived: '', - Emailed: '' + ArchivedStr: '', + EmailedStr: '' }; var monitorUrl = 'Storage()->Server()->UrlToIndex(); ?>'; From 191e2133375793ba146e4a2b89e04a6448cf21be Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Mon, 14 Dec 2020 10:02:43 -0600 Subject: [PATCH 49/53] upgrade to jquery 3.5.1, use minified javascripts --- web/skins/classic/includes/functions.php | 4 +- web/skins/classic/js/jquery-2.2.4.js | 9814 --------------------- web/skins/classic/js/jquery-3.5.1.min.js | 2 + web/skins/classic/js/jquery-3.5.1.min.map | 1 + web/skins/classic/js/jquery.js | 1 - web/skins/classic/js/jquery.js.URL | 1 - web/skins/classic/js/jquery.min.js | 1 + web/skins/classic/js/jquery.min.js.URL | 1 + 8 files changed, 7 insertions(+), 9818 deletions(-) delete mode 100644 web/skins/classic/js/jquery-2.2.4.js create mode 100644 web/skins/classic/js/jquery-3.5.1.min.js create mode 100644 web/skins/classic/js/jquery-3.5.1.min.map delete mode 120000 web/skins/classic/js/jquery.js delete mode 100644 web/skins/classic/js/jquery.js.URL create mode 120000 web/skins/classic/js/jquery.min.js create mode 100644 web/skins/classic/js/jquery.min.js.URL diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php index ee819ab58..e7b952a4a 100644 --- a/web/skins/classic/includes/functions.php +++ b/web/skins/classic/includes/functions.php @@ -871,8 +871,8 @@ function xhtmlFooter() { - - + + = 0 && j < len ? [ this[ j ] ] : [] ); - }, - - end: function() { - return this.prevObject || this.constructor(); - }, - - // For internal use only. - // Behaves like an Array's method, not like a jQuery method. - push: push, - sort: arr.sort, - splice: arr.splice -}; - -jQuery.extend = jQuery.fn.extend = function() { - var options, name, src, copy, copyIsArray, clone, - target = arguments[ 0 ] || {}, - i = 1, - length = arguments.length, - deep = false; - - // Handle a deep copy situation - if ( typeof target === "boolean" ) { - deep = target; - - // Skip the boolean and the target - target = arguments[ i ] || {}; - i++; - } - - // Handle case when target is a string or something (possible in deep copy) - if ( typeof target !== "object" && !jQuery.isFunction( target ) ) { - target = {}; - } - - // Extend jQuery itself if only one argument is passed - if ( i === length ) { - target = this; - i--; - } - - for ( ; i < length; i++ ) { - - // Only deal with non-null/undefined values - if ( ( options = arguments[ i ] ) != null ) { - - // Extend the base object - for ( name in options ) { - src = target[ name ]; - copy = options[ name ]; - - // Prevent never-ending loop - if ( target === copy ) { - continue; - } - - // Recurse if we're merging plain objects or arrays - if ( deep && copy && ( jQuery.isPlainObject( copy ) || - ( copyIsArray = jQuery.isArray( copy ) ) ) ) { - - if ( copyIsArray ) { - copyIsArray = false; - clone = src && jQuery.isArray( src ) ? src : []; - - } else { - clone = src && jQuery.isPlainObject( src ) ? src : {}; - } - - // Never move original objects, clone them - target[ name ] = jQuery.extend( deep, clone, copy ); - - // Don't bring in undefined values - } else if ( copy !== undefined ) { - target[ name ] = copy; - } - } - } - } - - // Return the modified object - return target; -}; - -jQuery.extend( { - - // Unique for each copy of jQuery on the page - expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ), - - // Assume jQuery is ready without the ready module - isReady: true, - - error: function( msg ) { - throw new Error( msg ); - }, - - noop: function() {}, - - isFunction: function( obj ) { - return jQuery.type( obj ) === "function"; - }, - - isArray: Array.isArray, - - isWindow: function( obj ) { - return obj != null && obj === obj.window; - }, - - isNumeric: function( obj ) { - - // parseFloat NaNs numeric-cast false positives (null|true|false|"") - // ...but misinterprets leading-number strings, particularly hex literals ("0x...") - // subtraction forces infinities to NaN - // adding 1 corrects loss of precision from parseFloat (#15100) - var realStringObj = obj && obj.toString(); - return !jQuery.isArray( obj ) && ( realStringObj - parseFloat( realStringObj ) + 1 ) >= 0; - }, - - isPlainObject: function( obj ) { - var key; - - // Not plain objects: - // - Any object or value whose internal [[Class]] property is not "[object Object]" - // - DOM nodes - // - window - if ( jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { - return false; - } - - // Not own constructor property must be Object - if ( obj.constructor && - !hasOwn.call( obj, "constructor" ) && - !hasOwn.call( obj.constructor.prototype || {}, "isPrototypeOf" ) ) { - return false; - } - - // Own properties are enumerated firstly, so to speed up, - // if last one is own, then all properties are own - for ( key in obj ) {} - - return key === undefined || hasOwn.call( obj, key ); - }, - - isEmptyObject: function( obj ) { - var name; - for ( name in obj ) { - return false; - } - return true; - }, - - type: function( obj ) { - if ( obj == null ) { - return obj + ""; - } - - // Support: Android<4.0, iOS<6 (functionish RegExp) - return typeof obj === "object" || typeof obj === "function" ? - class2type[ toString.call( obj ) ] || "object" : - typeof obj; - }, - - // Evaluates a script in a global context - globalEval: function( code ) { - var script, - indirect = eval; - - code = jQuery.trim( code ); - - if ( code ) { - - // If the code includes a valid, prologue position - // strict mode pragma, execute code by injecting a - // script tag into the document. - if ( code.indexOf( "use strict" ) === 1 ) { - script = document.createElement( "script" ); - script.text = code; - document.head.appendChild( script ).parentNode.removeChild( script ); - } else { - - // Otherwise, avoid the DOM node creation, insertion - // and removal by using an indirect global eval - - indirect( code ); - } - } - }, - - // Convert dashed to camelCase; used by the css and data modules - // Support: IE9-11+ - // Microsoft forgot to hump their vendor prefix (#9572) - camelCase: function( string ) { - return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); - }, - - nodeName: function( elem, name ) { - return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase(); - }, - - each: function( obj, callback ) { - var length, i = 0; - - if ( isArrayLike( obj ) ) { - length = obj.length; - for ( ; i < length; i++ ) { - if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) { - break; - } - } - } else { - for ( i in obj ) { - if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) { - break; - } - } - } - - return obj; - }, - - // Support: Android<4.1 - trim: function( text ) { - return text == null ? - "" : - ( text + "" ).replace( rtrim, "" ); - }, - - // results is for internal usage only - makeArray: function( arr, results ) { - var ret = results || []; - - if ( arr != null ) { - if ( isArrayLike( Object( arr ) ) ) { - jQuery.merge( ret, - typeof arr === "string" ? - [ arr ] : arr - ); - } else { - push.call( ret, arr ); - } - } - - return ret; - }, - - inArray: function( elem, arr, i ) { - return arr == null ? -1 : indexOf.call( arr, elem, i ); - }, - - merge: function( first, second ) { - var len = +second.length, - j = 0, - i = first.length; - - for ( ; j < len; j++ ) { - first[ i++ ] = second[ j ]; - } - - first.length = i; - - return first; - }, - - grep: function( elems, callback, invert ) { - var callbackInverse, - matches = [], - i = 0, - length = elems.length, - callbackExpect = !invert; - - // Go through the array, only saving the items - // that pass the validator function - for ( ; i < length; i++ ) { - callbackInverse = !callback( elems[ i ], i ); - if ( callbackInverse !== callbackExpect ) { - matches.push( elems[ i ] ); - } - } - - return matches; - }, - - // arg is for internal usage only - map: function( elems, callback, arg ) { - var length, value, - i = 0, - ret = []; - - // Go through the array, translating each of the items to their new values - if ( isArrayLike( elems ) ) { - length = elems.length; - for ( ; i < length; i++ ) { - value = callback( elems[ i ], i, arg ); - - if ( value != null ) { - ret.push( value ); - } - } - - // Go through every key on the object, - } else { - for ( i in elems ) { - value = callback( elems[ i ], i, arg ); - - if ( value != null ) { - ret.push( value ); - } - } - } - - // Flatten any nested arrays - return concat.apply( [], ret ); - }, - - // A global GUID counter for objects - guid: 1, - - // Bind a function to a context, optionally partially applying any - // arguments. - proxy: function( fn, context ) { - var tmp, args, proxy; - - if ( typeof context === "string" ) { - tmp = fn[ context ]; - context = fn; - fn = tmp; - } - - // Quick check to determine if target is callable, in the spec - // this throws a TypeError, but we will just return undefined. - if ( !jQuery.isFunction( fn ) ) { - return undefined; - } - - // Simulated bind - args = slice.call( arguments, 2 ); - proxy = function() { - return fn.apply( context || this, args.concat( slice.call( arguments ) ) ); - }; - - // Set the guid of unique handler to the same of original handler, so it can be removed - proxy.guid = fn.guid = fn.guid || jQuery.guid++; - - return proxy; - }, - - now: Date.now, - - // jQuery.support is not used in Core but other projects attach their - // properties to it so it needs to exist. - support: support -} ); - -// JSHint would error on this code due to the Symbol not being defined in ES5. -// Defining this global in .jshintrc would create a danger of using the global -// unguarded in another place, it seems safer to just disable JSHint for these -// three lines. -/* jshint ignore: start */ -if ( typeof Symbol === "function" ) { - jQuery.fn[ Symbol.iterator ] = arr[ Symbol.iterator ]; -} -/* jshint ignore: end */ - -// Populate the class2type map -jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ), -function( i, name ) { - class2type[ "[object " + name + "]" ] = name.toLowerCase(); -} ); - -function isArrayLike( obj ) { - - // Support: iOS 8.2 (not reproducible in simulator) - // `in` check used to prevent JIT error (gh-2145) - // hasOwn isn't used here due to false negatives - // regarding Nodelist length in IE - var length = !!obj && "length" in obj && obj.length, - type = jQuery.type( obj ); - - if ( type === "function" || jQuery.isWindow( obj ) ) { - return false; - } - - return type === "array" || length === 0 || - typeof length === "number" && length > 0 && ( length - 1 ) in obj; -} -var Sizzle = -/*! - * Sizzle CSS Selector Engine v2.2.1 - * http://sizzlejs.com/ - * - * Copyright jQuery Foundation and other contributors - * Released under the MIT license - * http://jquery.org/license - * - * Date: 2015-10-17 - */ -(function( window ) { - -var i, - support, - Expr, - getText, - isXML, - tokenize, - compile, - select, - outermostContext, - sortInput, - hasDuplicate, - - // Local document vars - setDocument, - document, - docElem, - documentIsHTML, - rbuggyQSA, - rbuggyMatches, - matches, - contains, - - // Instance-specific data - expando = "sizzle" + 1 * new Date(), - preferredDoc = window.document, - dirruns = 0, - done = 0, - classCache = createCache(), - tokenCache = createCache(), - compilerCache = createCache(), - sortOrder = function( a, b ) { - if ( a === b ) { - hasDuplicate = true; - } - return 0; - }, - - // General-purpose constants - MAX_NEGATIVE = 1 << 31, - - // Instance methods - hasOwn = ({}).hasOwnProperty, - arr = [], - pop = arr.pop, - push_native = arr.push, - push = arr.push, - slice = arr.slice, - // Use a stripped-down indexOf as it's faster than native - // http://jsperf.com/thor-indexof-vs-for/5 - indexOf = function( list, elem ) { - var i = 0, - len = list.length; - for ( ; i < len; i++ ) { - if ( list[i] === elem ) { - return i; - } - } - return -1; - }, - - booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped", - - // Regular expressions - - // http://www.w3.org/TR/css3-selectors/#whitespace - whitespace = "[\\x20\\t\\r\\n\\f]", - - // http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier - identifier = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+", - - // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors - attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace + - // Operator (capture 2) - "*([*^$|!~]?=)" + whitespace + - // "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]" - "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace + - "*\\]", - - pseudos = ":(" + identifier + ")(?:\\((" + - // To reduce the number of selectors needing tokenize in the preFilter, prefer arguments: - // 1. quoted (capture 3; capture 4 or capture 5) - "('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" + - // 2. simple (capture 6) - "((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" + - // 3. anything else (capture 2) - ".*" + - ")\\)|)", - - // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter - rwhitespace = new RegExp( whitespace + "+", "g" ), - rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ), - - rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ), - rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ), - - rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ), - - rpseudo = new RegExp( pseudos ), - ridentifier = new RegExp( "^" + identifier + "$" ), - - matchExpr = { - "ID": new RegExp( "^#(" + identifier + ")" ), - "CLASS": new RegExp( "^\\.(" + identifier + ")" ), - "TAG": new RegExp( "^(" + identifier + "|[*])" ), - "ATTR": new RegExp( "^" + attributes ), - "PSEUDO": new RegExp( "^" + pseudos ), - "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace + - "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace + - "*(\\d+)|))" + whitespace + "*\\)|)", "i" ), - "bool": new RegExp( "^(?:" + booleans + ")$", "i" ), - // For use in libraries implementing .is() - // We use this for POS matching in `select` - "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + - whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" ) - }, - - rinputs = /^(?:input|select|textarea|button)$/i, - rheader = /^h\d$/i, - - rnative = /^[^{]+\{\s*\[native \w/, - - // Easily-parseable/retrievable ID or TAG or CLASS selectors - rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, - - rsibling = /[+~]/, - rescape = /'|\\/g, - - // CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters - runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ), - funescape = function( _, escaped, escapedWhitespace ) { - var high = "0x" + escaped - 0x10000; - // NaN means non-codepoint - // Support: Firefox<24 - // Workaround erroneous numeric interpretation of +"0x" - return high !== high || escapedWhitespace ? - escaped : - high < 0 ? - // BMP codepoint - String.fromCharCode( high + 0x10000 ) : - // Supplemental Plane codepoint (surrogate pair) - String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 ); - }, - - // Used for iframes - // See setDocument() - // Removing the function wrapper causes a "Permission Denied" - // error in IE - unloadHandler = function() { - setDocument(); - }; - -// Optimize for push.apply( _, NodeList ) -try { - push.apply( - (arr = slice.call( preferredDoc.childNodes )), - preferredDoc.childNodes - ); - // Support: Android<4.0 - // Detect silently failing push.apply - arr[ preferredDoc.childNodes.length ].nodeType; -} catch ( e ) { - push = { apply: arr.length ? - - // Leverage slice if possible - function( target, els ) { - push_native.apply( target, slice.call(els) ); - } : - - // Support: IE<9 - // Otherwise append directly - function( target, els ) { - var j = target.length, - i = 0; - // Can't trust NodeList.length - while ( (target[j++] = els[i++]) ) {} - target.length = j - 1; - } - }; -} - -function Sizzle( selector, context, results, seed ) { - var m, i, elem, nid, nidselect, match, groups, newSelector, - newContext = context && context.ownerDocument, - - // nodeType defaults to 9, since context defaults to document - nodeType = context ? context.nodeType : 9; - - results = results || []; - - // Return early from calls with invalid selector or context - if ( typeof selector !== "string" || !selector || - nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) { - - return results; - } - - // Try to shortcut find operations (as opposed to filters) in HTML documents - if ( !seed ) { - - if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) { - setDocument( context ); - } - context = context || document; - - if ( documentIsHTML ) { - - // If the selector is sufficiently simple, try using a "get*By*" DOM method - // (excepting DocumentFragment context, where the methods don't exist) - if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) { - - // ID selector - if ( (m = match[1]) ) { - - // Document context - if ( nodeType === 9 ) { - if ( (elem = context.getElementById( m )) ) { - - // Support: IE, Opera, Webkit - // TODO: identify versions - // getElementById can match elements by name instead of ID - if ( elem.id === m ) { - results.push( elem ); - return results; - } - } else { - return results; - } - - // Element context - } else { - - // Support: IE, Opera, Webkit - // TODO: identify versions - // getElementById can match elements by name instead of ID - if ( newContext && (elem = newContext.getElementById( m )) && - contains( context, elem ) && - elem.id === m ) { - - results.push( elem ); - return results; - } - } - - // Type selector - } else if ( match[2] ) { - push.apply( results, context.getElementsByTagName( selector ) ); - return results; - - // Class selector - } else if ( (m = match[3]) && support.getElementsByClassName && - context.getElementsByClassName ) { - - push.apply( results, context.getElementsByClassName( m ) ); - return results; - } - } - - // Take advantage of querySelectorAll - if ( support.qsa && - !compilerCache[ selector + " " ] && - (!rbuggyQSA || !rbuggyQSA.test( selector )) ) { - - if ( nodeType !== 1 ) { - newContext = context; - newSelector = selector; - - // qSA looks outside Element context, which is not what we want - // Thanks to Andrew Dupont for this workaround technique - // Support: IE <=8 - // Exclude object elements - } else if ( context.nodeName.toLowerCase() !== "object" ) { - - // Capture the context ID, setting it first if necessary - if ( (nid = context.getAttribute( "id" )) ) { - nid = nid.replace( rescape, "\\$&" ); - } else { - context.setAttribute( "id", (nid = expando) ); - } - - // Prefix every selector in the list - groups = tokenize( selector ); - i = groups.length; - nidselect = ridentifier.test( nid ) ? "#" + nid : "[id='" + nid + "']"; - while ( i-- ) { - groups[i] = nidselect + " " + toSelector( groups[i] ); - } - newSelector = groups.join( "," ); - - // Expand context for sibling selectors - newContext = rsibling.test( selector ) && testContext( context.parentNode ) || - context; - } - - if ( newSelector ) { - try { - push.apply( results, - newContext.querySelectorAll( newSelector ) - ); - return results; - } catch ( qsaError ) { - } finally { - if ( nid === expando ) { - context.removeAttribute( "id" ); - } - } - } - } - } - } - - // All others - return select( selector.replace( rtrim, "$1" ), context, results, seed ); -} - -/** - * Create key-value caches of limited size - * @returns {function(string, object)} Returns the Object data after storing it on itself with - * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength) - * deleting the oldest entry - */ -function createCache() { - var keys = []; - - function cache( key, value ) { - // Use (key + " ") to avoid collision with native prototype properties (see Issue #157) - if ( keys.push( key + " " ) > Expr.cacheLength ) { - // Only keep the most recent entries - delete cache[ keys.shift() ]; - } - return (cache[ key + " " ] = value); - } - return cache; -} - -/** - * Mark a function for special use by Sizzle - * @param {Function} fn The function to mark - */ -function markFunction( fn ) { - fn[ expando ] = true; - return fn; -} - -/** - * Support testing using an element - * @param {Function} fn Passed the created div and expects a boolean result - */ -function assert( fn ) { - var div = document.createElement("div"); - - try { - return !!fn( div ); - } catch (e) { - return false; - } finally { - // Remove from its parent by default - if ( div.parentNode ) { - div.parentNode.removeChild( div ); - } - // release memory in IE - div = null; - } -} - -/** - * Adds the same handler for all of the specified attrs - * @param {String} attrs Pipe-separated list of attributes - * @param {Function} handler The method that will be applied - */ -function addHandle( attrs, handler ) { - var arr = attrs.split("|"), - i = arr.length; - - while ( i-- ) { - Expr.attrHandle[ arr[i] ] = handler; - } -} - -/** - * Checks document order of two siblings - * @param {Element} a - * @param {Element} b - * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b - */ -function siblingCheck( a, b ) { - var cur = b && a, - diff = cur && a.nodeType === 1 && b.nodeType === 1 && - ( ~b.sourceIndex || MAX_NEGATIVE ) - - ( ~a.sourceIndex || MAX_NEGATIVE ); - - // Use IE sourceIndex if available on both nodes - if ( diff ) { - return diff; - } - - // Check if b follows a - if ( cur ) { - while ( (cur = cur.nextSibling) ) { - if ( cur === b ) { - return -1; - } - } - } - - return a ? 1 : -1; -} - -/** - * Returns a function to use in pseudos for input types - * @param {String} type - */ -function createInputPseudo( type ) { - return function( elem ) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && elem.type === type; - }; -} - -/** - * Returns a function to use in pseudos for buttons - * @param {String} type - */ -function createButtonPseudo( type ) { - return function( elem ) { - var name = elem.nodeName.toLowerCase(); - return (name === "input" || name === "button") && elem.type === type; - }; -} - -/** - * Returns a function to use in pseudos for positionals - * @param {Function} fn - */ -function createPositionalPseudo( fn ) { - return markFunction(function( argument ) { - argument = +argument; - return markFunction(function( seed, matches ) { - var j, - matchIndexes = fn( [], seed.length, argument ), - i = matchIndexes.length; - - // Match elements found at the specified indexes - while ( i-- ) { - if ( seed[ (j = matchIndexes[i]) ] ) { - seed[j] = !(matches[j] = seed[j]); - } - } - }); - }); -} - -/** - * Checks a node for validity as a Sizzle context - * @param {Element|Object=} context - * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value - */ -function testContext( context ) { - return context && typeof context.getElementsByTagName !== "undefined" && context; -} - -// Expose support vars for convenience -support = Sizzle.support = {}; - -/** - * Detects XML nodes - * @param {Element|Object} elem An element or a document - * @returns {Boolean} True iff elem is a non-HTML XML node - */ -isXML = Sizzle.isXML = function( elem ) { - // documentElement is verified for cases where it doesn't yet exist - // (such as loading iframes in IE - #4833) - var documentElement = elem && (elem.ownerDocument || elem).documentElement; - return documentElement ? documentElement.nodeName !== "HTML" : false; -}; - -/** - * Sets document-related variables once based on the current document - * @param {Element|Object} [doc] An element or document object to use to set the document - * @returns {Object} Returns the current document - */ -setDocument = Sizzle.setDocument = function( node ) { - var hasCompare, parent, - doc = node ? node.ownerDocument || node : preferredDoc; - - // Return early if doc is invalid or already selected - if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) { - return document; - } - - // Update global variables - document = doc; - docElem = document.documentElement; - documentIsHTML = !isXML( document ); - - // Support: IE 9-11, Edge - // Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936) - if ( (parent = document.defaultView) && parent.top !== parent ) { - // Support: IE 11 - if ( parent.addEventListener ) { - parent.addEventListener( "unload", unloadHandler, false ); - - // Support: IE 9 - 10 only - } else if ( parent.attachEvent ) { - parent.attachEvent( "onunload", unloadHandler ); - } - } - - /* Attributes - ---------------------------------------------------------------------- */ - - // Support: IE<8 - // Verify that getAttribute really returns attributes and not properties - // (excepting IE8 booleans) - support.attributes = assert(function( div ) { - div.className = "i"; - return !div.getAttribute("className"); - }); - - /* getElement(s)By* - ---------------------------------------------------------------------- */ - - // Check if getElementsByTagName("*") returns only elements - support.getElementsByTagName = assert(function( div ) { - div.appendChild( document.createComment("") ); - return !div.getElementsByTagName("*").length; - }); - - // Support: IE<9 - support.getElementsByClassName = rnative.test( document.getElementsByClassName ); - - // Support: IE<10 - // Check if getElementById returns elements by name - // The broken getElementById methods don't pick up programatically-set names, - // so use a roundabout getElementsByName test - support.getById = assert(function( div ) { - docElem.appendChild( div ).id = expando; - return !document.getElementsByName || !document.getElementsByName( expando ).length; - }); - - // ID find and filter - if ( support.getById ) { - Expr.find["ID"] = function( id, context ) { - if ( typeof context.getElementById !== "undefined" && documentIsHTML ) { - var m = context.getElementById( id ); - return m ? [ m ] : []; - } - }; - Expr.filter["ID"] = function( id ) { - var attrId = id.replace( runescape, funescape ); - return function( elem ) { - return elem.getAttribute("id") === attrId; - }; - }; - } else { - // Support: IE6/7 - // getElementById is not reliable as a find shortcut - delete Expr.find["ID"]; - - Expr.filter["ID"] = function( id ) { - var attrId = id.replace( runescape, funescape ); - return function( elem ) { - var node = typeof elem.getAttributeNode !== "undefined" && - elem.getAttributeNode("id"); - return node && node.value === attrId; - }; - }; - } - - // Tag - Expr.find["TAG"] = support.getElementsByTagName ? - function( tag, context ) { - if ( typeof context.getElementsByTagName !== "undefined" ) { - return context.getElementsByTagName( tag ); - - // DocumentFragment nodes don't have gEBTN - } else if ( support.qsa ) { - return context.querySelectorAll( tag ); - } - } : - - function( tag, context ) { - var elem, - tmp = [], - i = 0, - // By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too - results = context.getElementsByTagName( tag ); - - // Filter out possible comments - if ( tag === "*" ) { - while ( (elem = results[i++]) ) { - if ( elem.nodeType === 1 ) { - tmp.push( elem ); - } - } - - return tmp; - } - return results; - }; - - // Class - Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) { - if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) { - return context.getElementsByClassName( className ); - } - }; - - /* QSA/matchesSelector - ---------------------------------------------------------------------- */ - - // QSA and matchesSelector support - - // matchesSelector(:active) reports false when true (IE9/Opera 11.5) - rbuggyMatches = []; - - // qSa(:focus) reports false when true (Chrome 21) - // We allow this because of a bug in IE8/9 that throws an error - // whenever `document.activeElement` is accessed on an iframe - // So, we allow :focus to pass through QSA all the time to avoid the IE error - // See http://bugs.jquery.com/ticket/13378 - rbuggyQSA = []; - - if ( (support.qsa = rnative.test( document.querySelectorAll )) ) { - // Build QSA regex - // Regex strategy adopted from Diego Perini - assert(function( div ) { - // Select is set to empty string on purpose - // This is to test IE's treatment of not explicitly - // setting a boolean content attribute, - // since its presence should be enough - // http://bugs.jquery.com/ticket/12359 - docElem.appendChild( div ).innerHTML = "" + - ""; - - // Support: IE8, Opera 11-12.16 - // Nothing should be selected when empty strings follow ^= or $= or *= - // The test attribute must be unknown in Opera but "safe" for WinRT - // http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section - if ( div.querySelectorAll("[msallowcapture^='']").length ) { - rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" ); - } - - // Support: IE8 - // Boolean attributes and "value" are not treated correctly - if ( !div.querySelectorAll("[selected]").length ) { - rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" ); - } - - // Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+ - if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) { - rbuggyQSA.push("~="); - } - - // Webkit/Opera - :checked should return selected option elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked - // IE8 throws error here and will not see later tests - if ( !div.querySelectorAll(":checked").length ) { - rbuggyQSA.push(":checked"); - } - - // Support: Safari 8+, iOS 8+ - // https://bugs.webkit.org/show_bug.cgi?id=136851 - // In-page `selector#id sibing-combinator selector` fails - if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) { - rbuggyQSA.push(".#.+[+~]"); - } - }); - - assert(function( div ) { - // Support: Windows 8 Native Apps - // The type and name attributes are restricted during .innerHTML assignment - var input = document.createElement("input"); - input.setAttribute( "type", "hidden" ); - div.appendChild( input ).setAttribute( "name", "D" ); - - // Support: IE8 - // Enforce case-sensitivity of name attribute - if ( div.querySelectorAll("[name=d]").length ) { - rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" ); - } - - // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled) - // IE8 throws error here and will not see later tests - if ( !div.querySelectorAll(":enabled").length ) { - rbuggyQSA.push( ":enabled", ":disabled" ); - } - - // Opera 10-11 does not throw on post-comma invalid pseudos - div.querySelectorAll("*,:x"); - rbuggyQSA.push(",.*:"); - }); - } - - if ( (support.matchesSelector = rnative.test( (matches = docElem.matches || - docElem.webkitMatchesSelector || - docElem.mozMatchesSelector || - docElem.oMatchesSelector || - docElem.msMatchesSelector) )) ) { - - assert(function( div ) { - // Check to see if it's possible to do matchesSelector - // on a disconnected node (IE 9) - support.disconnectedMatch = matches.call( div, "div" ); - - // This should fail with an exception - // Gecko does not error, returns false instead - matches.call( div, "[s!='']:x" ); - rbuggyMatches.push( "!=", pseudos ); - }); - } - - rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") ); - rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") ); - - /* Contains - ---------------------------------------------------------------------- */ - hasCompare = rnative.test( docElem.compareDocumentPosition ); - - // Element contains another - // Purposefully self-exclusive - // As in, an element does not contain itself - contains = hasCompare || rnative.test( docElem.contains ) ? - function( a, b ) { - var adown = a.nodeType === 9 ? a.documentElement : a, - bup = b && b.parentNode; - return a === bup || !!( bup && bup.nodeType === 1 && ( - adown.contains ? - adown.contains( bup ) : - a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16 - )); - } : - function( a, b ) { - if ( b ) { - while ( (b = b.parentNode) ) { - if ( b === a ) { - return true; - } - } - } - return false; - }; - - /* Sorting - ---------------------------------------------------------------------- */ - - // Document order sorting - sortOrder = hasCompare ? - function( a, b ) { - - // Flag for duplicate removal - if ( a === b ) { - hasDuplicate = true; - return 0; - } - - // Sort on method existence if only one input has compareDocumentPosition - var compare = !a.compareDocumentPosition - !b.compareDocumentPosition; - if ( compare ) { - return compare; - } - - // Calculate position if both inputs belong to the same document - compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ? - a.compareDocumentPosition( b ) : - - // Otherwise we know they are disconnected - 1; - - // Disconnected nodes - if ( compare & 1 || - (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) { - - // Choose the first element that is related to our preferred document - if ( a === document || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) { - return -1; - } - if ( b === document || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) { - return 1; - } - - // Maintain original order - return sortInput ? - ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : - 0; - } - - return compare & 4 ? -1 : 1; - } : - function( a, b ) { - // Exit early if the nodes are identical - if ( a === b ) { - hasDuplicate = true; - return 0; - } - - var cur, - i = 0, - aup = a.parentNode, - bup = b.parentNode, - ap = [ a ], - bp = [ b ]; - - // Parentless nodes are either documents or disconnected - if ( !aup || !bup ) { - return a === document ? -1 : - b === document ? 1 : - aup ? -1 : - bup ? 1 : - sortInput ? - ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : - 0; - - // If the nodes are siblings, we can do a quick check - } else if ( aup === bup ) { - return siblingCheck( a, b ); - } - - // Otherwise we need full lists of their ancestors for comparison - cur = a; - while ( (cur = cur.parentNode) ) { - ap.unshift( cur ); - } - cur = b; - while ( (cur = cur.parentNode) ) { - bp.unshift( cur ); - } - - // Walk down the tree looking for a discrepancy - while ( ap[i] === bp[i] ) { - i++; - } - - return i ? - // Do a sibling check if the nodes have a common ancestor - siblingCheck( ap[i], bp[i] ) : - - // Otherwise nodes in our document sort first - ap[i] === preferredDoc ? -1 : - bp[i] === preferredDoc ? 1 : - 0; - }; - - return document; -}; - -Sizzle.matches = function( expr, elements ) { - return Sizzle( expr, null, null, elements ); -}; - -Sizzle.matchesSelector = function( elem, expr ) { - // Set document vars if needed - if ( ( elem.ownerDocument || elem ) !== document ) { - setDocument( elem ); - } - - // Make sure that attribute selectors are quoted - expr = expr.replace( rattributeQuotes, "='$1']" ); - - if ( support.matchesSelector && documentIsHTML && - !compilerCache[ expr + " " ] && - ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) && - ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) { - - try { - var ret = matches.call( elem, expr ); - - // IE 9's matchesSelector returns false on disconnected nodes - if ( ret || support.disconnectedMatch || - // As well, disconnected nodes are said to be in a document - // fragment in IE 9 - elem.document && elem.document.nodeType !== 11 ) { - return ret; - } - } catch (e) {} - } - - return Sizzle( expr, document, null, [ elem ] ).length > 0; -}; - -Sizzle.contains = function( context, elem ) { - // Set document vars if needed - if ( ( context.ownerDocument || context ) !== document ) { - setDocument( context ); - } - return contains( context, elem ); -}; - -Sizzle.attr = function( elem, name ) { - // Set document vars if needed - if ( ( elem.ownerDocument || elem ) !== document ) { - setDocument( elem ); - } - - var fn = Expr.attrHandle[ name.toLowerCase() ], - // Don't get fooled by Object.prototype properties (jQuery #13807) - val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ? - fn( elem, name, !documentIsHTML ) : - undefined; - - return val !== undefined ? - val : - support.attributes || !documentIsHTML ? - elem.getAttribute( name ) : - (val = elem.getAttributeNode(name)) && val.specified ? - val.value : - null; -}; - -Sizzle.error = function( msg ) { - throw new Error( "Syntax error, unrecognized expression: " + msg ); -}; - -/** - * Document sorting and removing duplicates - * @param {ArrayLike} results - */ -Sizzle.uniqueSort = function( results ) { - var elem, - duplicates = [], - j = 0, - i = 0; - - // Unless we *know* we can detect duplicates, assume their presence - hasDuplicate = !support.detectDuplicates; - sortInput = !support.sortStable && results.slice( 0 ); - results.sort( sortOrder ); - - if ( hasDuplicate ) { - while ( (elem = results[i++]) ) { - if ( elem === results[ i ] ) { - j = duplicates.push( i ); - } - } - while ( j-- ) { - results.splice( duplicates[ j ], 1 ); - } - } - - // Clear input after sorting to release objects - // See https://github.com/jquery/sizzle/pull/225 - sortInput = null; - - return results; -}; - -/** - * Utility function for retrieving the text value of an array of DOM nodes - * @param {Array|Element} elem - */ -getText = Sizzle.getText = function( elem ) { - var node, - ret = "", - i = 0, - nodeType = elem.nodeType; - - if ( !nodeType ) { - // If no nodeType, this is expected to be an array - while ( (node = elem[i++]) ) { - // Do not traverse comment nodes - ret += getText( node ); - } - } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { - // Use textContent for elements - // innerText usage removed for consistency of new lines (jQuery #11153) - if ( typeof elem.textContent === "string" ) { - return elem.textContent; - } else { - // Traverse its children - for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { - ret += getText( elem ); - } - } - } else if ( nodeType === 3 || nodeType === 4 ) { - return elem.nodeValue; - } - // Do not include comment or processing instruction nodes - - return ret; -}; - -Expr = Sizzle.selectors = { - - // Can be adjusted by the user - cacheLength: 50, - - createPseudo: markFunction, - - match: matchExpr, - - attrHandle: {}, - - find: {}, - - relative: { - ">": { dir: "parentNode", first: true }, - " ": { dir: "parentNode" }, - "+": { dir: "previousSibling", first: true }, - "~": { dir: "previousSibling" } - }, - - preFilter: { - "ATTR": function( match ) { - match[1] = match[1].replace( runescape, funescape ); - - // Move the given value to match[3] whether quoted or unquoted - match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape ); - - if ( match[2] === "~=" ) { - match[3] = " " + match[3] + " "; - } - - return match.slice( 0, 4 ); - }, - - "CHILD": function( match ) { - /* matches from matchExpr["CHILD"] - 1 type (only|nth|...) - 2 what (child|of-type) - 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...) - 4 xn-component of xn+y argument ([+-]?\d*n|) - 5 sign of xn-component - 6 x of xn-component - 7 sign of y-component - 8 y of y-component - */ - match[1] = match[1].toLowerCase(); - - if ( match[1].slice( 0, 3 ) === "nth" ) { - // nth-* requires argument - if ( !match[3] ) { - Sizzle.error( match[0] ); - } - - // numeric x and y parameters for Expr.filter.CHILD - // remember that false/true cast respectively to 0/1 - match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) ); - match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" ); - - // other types prohibit arguments - } else if ( match[3] ) { - Sizzle.error( match[0] ); - } - - return match; - }, - - "PSEUDO": function( match ) { - var excess, - unquoted = !match[6] && match[2]; - - if ( matchExpr["CHILD"].test( match[0] ) ) { - return null; - } - - // Accept quoted arguments as-is - if ( match[3] ) { - match[2] = match[4] || match[5] || ""; - - // Strip excess characters from unquoted arguments - } else if ( unquoted && rpseudo.test( unquoted ) && - // Get excess from tokenize (recursively) - (excess = tokenize( unquoted, true )) && - // advance to the next closing parenthesis - (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) { - - // excess is a negative index - match[0] = match[0].slice( 0, excess ); - match[2] = unquoted.slice( 0, excess ); - } - - // Return only captures needed by the pseudo filter method (type and argument) - return match.slice( 0, 3 ); - } - }, - - filter: { - - "TAG": function( nodeNameSelector ) { - var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase(); - return nodeNameSelector === "*" ? - function() { return true; } : - function( elem ) { - return elem.nodeName && elem.nodeName.toLowerCase() === nodeName; - }; - }, - - "CLASS": function( className ) { - var pattern = classCache[ className + " " ]; - - return pattern || - (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) && - classCache( className, function( elem ) { - return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" ); - }); - }, - - "ATTR": function( name, operator, check ) { - return function( elem ) { - var result = Sizzle.attr( elem, name ); - - if ( result == null ) { - return operator === "!="; - } - if ( !operator ) { - return true; - } - - result += ""; - - return operator === "=" ? result === check : - operator === "!=" ? result !== check : - operator === "^=" ? check && result.indexOf( check ) === 0 : - operator === "*=" ? check && result.indexOf( check ) > -1 : - operator === "$=" ? check && result.slice( -check.length ) === check : - operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 : - operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" : - false; - }; - }, - - "CHILD": function( type, what, argument, first, last ) { - var simple = type.slice( 0, 3 ) !== "nth", - forward = type.slice( -4 ) !== "last", - ofType = what === "of-type"; - - return first === 1 && last === 0 ? - - // Shortcut for :nth-*(n) - function( elem ) { - return !!elem.parentNode; - } : - - function( elem, context, xml ) { - var cache, uniqueCache, outerCache, node, nodeIndex, start, - dir = simple !== forward ? "nextSibling" : "previousSibling", - parent = elem.parentNode, - name = ofType && elem.nodeName.toLowerCase(), - useCache = !xml && !ofType, - diff = false; - - if ( parent ) { - - // :(first|last|only)-(child|of-type) - if ( simple ) { - while ( dir ) { - node = elem; - while ( (node = node[ dir ]) ) { - if ( ofType ? - node.nodeName.toLowerCase() === name : - node.nodeType === 1 ) { - - return false; - } - } - // Reverse direction for :only-* (if we haven't yet done so) - start = dir = type === "only" && !start && "nextSibling"; - } - return true; - } - - start = [ forward ? parent.firstChild : parent.lastChild ]; - - // non-xml :nth-child(...) stores cache data on `parent` - if ( forward && useCache ) { - - // Seek `elem` from a previously-cached index - - // ...in a gzip-friendly way - node = parent; - outerCache = node[ expando ] || (node[ expando ] = {}); - - // Support: IE <9 only - // Defend against cloned attroperties (jQuery gh-1709) - uniqueCache = outerCache[ node.uniqueID ] || - (outerCache[ node.uniqueID ] = {}); - - cache = uniqueCache[ type ] || []; - nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ]; - diff = nodeIndex && cache[ 2 ]; - node = nodeIndex && parent.childNodes[ nodeIndex ]; - - while ( (node = ++nodeIndex && node && node[ dir ] || - - // Fallback to seeking `elem` from the start - (diff = nodeIndex = 0) || start.pop()) ) { - - // When found, cache indexes on `parent` and break - if ( node.nodeType === 1 && ++diff && node === elem ) { - uniqueCache[ type ] = [ dirruns, nodeIndex, diff ]; - break; - } - } - - } else { - // Use previously-cached element index if available - if ( useCache ) { - // ...in a gzip-friendly way - node = elem; - outerCache = node[ expando ] || (node[ expando ] = {}); - - // Support: IE <9 only - // Defend against cloned attroperties (jQuery gh-1709) - uniqueCache = outerCache[ node.uniqueID ] || - (outerCache[ node.uniqueID ] = {}); - - cache = uniqueCache[ type ] || []; - nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ]; - diff = nodeIndex; - } - - // xml :nth-child(...) - // or :nth-last-child(...) or :nth(-last)?-of-type(...) - if ( diff === false ) { - // Use the same loop as above to seek `elem` from the start - while ( (node = ++nodeIndex && node && node[ dir ] || - (diff = nodeIndex = 0) || start.pop()) ) { - - if ( ( ofType ? - node.nodeName.toLowerCase() === name : - node.nodeType === 1 ) && - ++diff ) { - - // Cache the index of each encountered element - if ( useCache ) { - outerCache = node[ expando ] || (node[ expando ] = {}); - - // Support: IE <9 only - // Defend against cloned attroperties (jQuery gh-1709) - uniqueCache = outerCache[ node.uniqueID ] || - (outerCache[ node.uniqueID ] = {}); - - uniqueCache[ type ] = [ dirruns, diff ]; - } - - if ( node === elem ) { - break; - } - } - } - } - } - - // Incorporate the offset, then check against cycle size - diff -= last; - return diff === first || ( diff % first === 0 && diff / first >= 0 ); - } - }; - }, - - "PSEUDO": function( pseudo, argument ) { - // pseudo-class names are case-insensitive - // http://www.w3.org/TR/selectors/#pseudo-classes - // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters - // Remember that setFilters inherits from pseudos - var args, - fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] || - Sizzle.error( "unsupported pseudo: " + pseudo ); - - // The user may use createPseudo to indicate that - // arguments are needed to create the filter function - // just as Sizzle does - if ( fn[ expando ] ) { - return fn( argument ); - } - - // But maintain support for old signatures - if ( fn.length > 1 ) { - args = [ pseudo, pseudo, "", argument ]; - return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ? - markFunction(function( seed, matches ) { - var idx, - matched = fn( seed, argument ), - i = matched.length; - while ( i-- ) { - idx = indexOf( seed, matched[i] ); - seed[ idx ] = !( matches[ idx ] = matched[i] ); - } - }) : - function( elem ) { - return fn( elem, 0, args ); - }; - } - - return fn; - } - }, - - pseudos: { - // Potentially complex pseudos - "not": markFunction(function( selector ) { - // Trim the selector passed to compile - // to avoid treating leading and trailing - // spaces as combinators - var input = [], - results = [], - matcher = compile( selector.replace( rtrim, "$1" ) ); - - return matcher[ expando ] ? - markFunction(function( seed, matches, context, xml ) { - var elem, - unmatched = matcher( seed, null, xml, [] ), - i = seed.length; - - // Match elements unmatched by `matcher` - while ( i-- ) { - if ( (elem = unmatched[i]) ) { - seed[i] = !(matches[i] = elem); - } - } - }) : - function( elem, context, xml ) { - input[0] = elem; - matcher( input, null, xml, results ); - // Don't keep the element (issue #299) - input[0] = null; - return !results.pop(); - }; - }), - - "has": markFunction(function( selector ) { - return function( elem ) { - return Sizzle( selector, elem ).length > 0; - }; - }), - - "contains": markFunction(function( text ) { - text = text.replace( runescape, funescape ); - return function( elem ) { - return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1; - }; - }), - - // "Whether an element is represented by a :lang() selector - // is based solely on the element's language value - // being equal to the identifier C, - // or beginning with the identifier C immediately followed by "-". - // The matching of C against the element's language value is performed case-insensitively. - // The identifier C does not have to be a valid language name." - // http://www.w3.org/TR/selectors/#lang-pseudo - "lang": markFunction( function( lang ) { - // lang value must be a valid identifier - if ( !ridentifier.test(lang || "") ) { - Sizzle.error( "unsupported lang: " + lang ); - } - lang = lang.replace( runescape, funescape ).toLowerCase(); - return function( elem ) { - var elemLang; - do { - if ( (elemLang = documentIsHTML ? - elem.lang : - elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) { - - elemLang = elemLang.toLowerCase(); - return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0; - } - } while ( (elem = elem.parentNode) && elem.nodeType === 1 ); - return false; - }; - }), - - // Miscellaneous - "target": function( elem ) { - var hash = window.location && window.location.hash; - return hash && hash.slice( 1 ) === elem.id; - }, - - "root": function( elem ) { - return elem === docElem; - }, - - "focus": function( elem ) { - return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex); - }, - - // Boolean properties - "enabled": function( elem ) { - return elem.disabled === false; - }, - - "disabled": function( elem ) { - return elem.disabled === true; - }, - - "checked": function( elem ) { - // In CSS3, :checked should return both checked and selected elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked - var nodeName = elem.nodeName.toLowerCase(); - return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected); - }, - - "selected": function( elem ) { - // Accessing this property makes selected-by-default - // options in Safari work properly - if ( elem.parentNode ) { - elem.parentNode.selectedIndex; - } - - return elem.selected === true; - }, - - // Contents - "empty": function( elem ) { - // http://www.w3.org/TR/selectors/#empty-pseudo - // :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5), - // but not by others (comment: 8; processing instruction: 7; etc.) - // nodeType < 6 works because attributes (2) do not appear as children - for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { - if ( elem.nodeType < 6 ) { - return false; - } - } - return true; - }, - - "parent": function( elem ) { - return !Expr.pseudos["empty"]( elem ); - }, - - // Element/input types - "header": function( elem ) { - return rheader.test( elem.nodeName ); - }, - - "input": function( elem ) { - return rinputs.test( elem.nodeName ); - }, - - "button": function( elem ) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && elem.type === "button" || name === "button"; - }, - - "text": function( elem ) { - var attr; - return elem.nodeName.toLowerCase() === "input" && - elem.type === "text" && - - // Support: IE<8 - // New HTML5 attribute values (e.g., "search") appear with elem.type === "text" - ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" ); - }, - - // Position-in-collection - "first": createPositionalPseudo(function() { - return [ 0 ]; - }), - - "last": createPositionalPseudo(function( matchIndexes, length ) { - return [ length - 1 ]; - }), - - "eq": createPositionalPseudo(function( matchIndexes, length, argument ) { - return [ argument < 0 ? argument + length : argument ]; - }), - - "even": createPositionalPseudo(function( matchIndexes, length ) { - var i = 0; - for ( ; i < length; i += 2 ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "odd": createPositionalPseudo(function( matchIndexes, length ) { - var i = 1; - for ( ; i < length; i += 2 ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "lt": createPositionalPseudo(function( matchIndexes, length, argument ) { - var i = argument < 0 ? argument + length : argument; - for ( ; --i >= 0; ) { - matchIndexes.push( i ); - } - return matchIndexes; - }), - - "gt": createPositionalPseudo(function( matchIndexes, length, argument ) { - var i = argument < 0 ? argument + length : argument; - for ( ; ++i < length; ) { - matchIndexes.push( i ); - } - return matchIndexes; - }) - } -}; - -Expr.pseudos["nth"] = Expr.pseudos["eq"]; - -// Add button/input type pseudos -for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) { - Expr.pseudos[ i ] = createInputPseudo( i ); -} -for ( i in { submit: true, reset: true } ) { - Expr.pseudos[ i ] = createButtonPseudo( i ); -} - -// Easy API for creating new setFilters -function setFilters() {} -setFilters.prototype = Expr.filters = Expr.pseudos; -Expr.setFilters = new setFilters(); - -tokenize = Sizzle.tokenize = function( selector, parseOnly ) { - var matched, match, tokens, type, - soFar, groups, preFilters, - cached = tokenCache[ selector + " " ]; - - if ( cached ) { - return parseOnly ? 0 : cached.slice( 0 ); - } - - soFar = selector; - groups = []; - preFilters = Expr.preFilter; - - while ( soFar ) { - - // Comma and first run - if ( !matched || (match = rcomma.exec( soFar )) ) { - if ( match ) { - // Don't consume trailing commas as valid - soFar = soFar.slice( match[0].length ) || soFar; - } - groups.push( (tokens = []) ); - } - - matched = false; - - // Combinators - if ( (match = rcombinators.exec( soFar )) ) { - matched = match.shift(); - tokens.push({ - value: matched, - // Cast descendant combinators to space - type: match[0].replace( rtrim, " " ) - }); - soFar = soFar.slice( matched.length ); - } - - // Filters - for ( type in Expr.filter ) { - if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] || - (match = preFilters[ type ]( match ))) ) { - matched = match.shift(); - tokens.push({ - value: matched, - type: type, - matches: match - }); - soFar = soFar.slice( matched.length ); - } - } - - if ( !matched ) { - break; - } - } - - // Return the length of the invalid excess - // if we're just parsing - // Otherwise, throw an error or return tokens - return parseOnly ? - soFar.length : - soFar ? - Sizzle.error( selector ) : - // Cache the tokens - tokenCache( selector, groups ).slice( 0 ); -}; - -function toSelector( tokens ) { - var i = 0, - len = tokens.length, - selector = ""; - for ( ; i < len; i++ ) { - selector += tokens[i].value; - } - return selector; -} - -function addCombinator( matcher, combinator, base ) { - var dir = combinator.dir, - checkNonElements = base && dir === "parentNode", - doneName = done++; - - return combinator.first ? - // Check against closest ancestor/preceding element - function( elem, context, xml ) { - while ( (elem = elem[ dir ]) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - return matcher( elem, context, xml ); - } - } - } : - - // Check against all ancestor/preceding elements - function( elem, context, xml ) { - var oldCache, uniqueCache, outerCache, - newCache = [ dirruns, doneName ]; - - // We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching - if ( xml ) { - while ( (elem = elem[ dir ]) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - if ( matcher( elem, context, xml ) ) { - return true; - } - } - } - } else { - while ( (elem = elem[ dir ]) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - outerCache = elem[ expando ] || (elem[ expando ] = {}); - - // Support: IE <9 only - // Defend against cloned attroperties (jQuery gh-1709) - uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {}); - - if ( (oldCache = uniqueCache[ dir ]) && - oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) { - - // Assign to newCache so results back-propagate to previous elements - return (newCache[ 2 ] = oldCache[ 2 ]); - } else { - // Reuse newcache so results back-propagate to previous elements - uniqueCache[ dir ] = newCache; - - // A match means we're done; a fail means we have to keep checking - if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) { - return true; - } - } - } - } - } - }; -} - -function elementMatcher( matchers ) { - return matchers.length > 1 ? - function( elem, context, xml ) { - var i = matchers.length; - while ( i-- ) { - if ( !matchers[i]( elem, context, xml ) ) { - return false; - } - } - return true; - } : - matchers[0]; -} - -function multipleContexts( selector, contexts, results ) { - var i = 0, - len = contexts.length; - for ( ; i < len; i++ ) { - Sizzle( selector, contexts[i], results ); - } - return results; -} - -function condense( unmatched, map, filter, context, xml ) { - var elem, - newUnmatched = [], - i = 0, - len = unmatched.length, - mapped = map != null; - - for ( ; i < len; i++ ) { - if ( (elem = unmatched[i]) ) { - if ( !filter || filter( elem, context, xml ) ) { - newUnmatched.push( elem ); - if ( mapped ) { - map.push( i ); - } - } - } - } - - return newUnmatched; -} - -function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) { - if ( postFilter && !postFilter[ expando ] ) { - postFilter = setMatcher( postFilter ); - } - if ( postFinder && !postFinder[ expando ] ) { - postFinder = setMatcher( postFinder, postSelector ); - } - return markFunction(function( seed, results, context, xml ) { - var temp, i, elem, - preMap = [], - postMap = [], - preexisting = results.length, - - // Get initial elements from seed or context - elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ), - - // Prefilter to get matcher input, preserving a map for seed-results synchronization - matcherIn = preFilter && ( seed || !selector ) ? - condense( elems, preMap, preFilter, context, xml ) : - elems, - - matcherOut = matcher ? - // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results, - postFinder || ( seed ? preFilter : preexisting || postFilter ) ? - - // ...intermediate processing is necessary - [] : - - // ...otherwise use results directly - results : - matcherIn; - - // Find primary matches - if ( matcher ) { - matcher( matcherIn, matcherOut, context, xml ); - } - - // Apply postFilter - if ( postFilter ) { - temp = condense( matcherOut, postMap ); - postFilter( temp, [], context, xml ); - - // Un-match failing elements by moving them back to matcherIn - i = temp.length; - while ( i-- ) { - if ( (elem = temp[i]) ) { - matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem); - } - } - } - - if ( seed ) { - if ( postFinder || preFilter ) { - if ( postFinder ) { - // Get the final matcherOut by condensing this intermediate into postFinder contexts - temp = []; - i = matcherOut.length; - while ( i-- ) { - if ( (elem = matcherOut[i]) ) { - // Restore matcherIn since elem is not yet a final match - temp.push( (matcherIn[i] = elem) ); - } - } - postFinder( null, (matcherOut = []), temp, xml ); - } - - // Move matched elements from seed to results to keep them synchronized - i = matcherOut.length; - while ( i-- ) { - if ( (elem = matcherOut[i]) && - (temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) { - - seed[temp] = !(results[temp] = elem); - } - } - } - - // Add elements to results, through postFinder if defined - } else { - matcherOut = condense( - matcherOut === results ? - matcherOut.splice( preexisting, matcherOut.length ) : - matcherOut - ); - if ( postFinder ) { - postFinder( null, results, matcherOut, xml ); - } else { - push.apply( results, matcherOut ); - } - } - }); -} - -function matcherFromTokens( tokens ) { - var checkContext, matcher, j, - len = tokens.length, - leadingRelative = Expr.relative[ tokens[0].type ], - implicitRelative = leadingRelative || Expr.relative[" "], - i = leadingRelative ? 1 : 0, - - // The foundational matcher ensures that elements are reachable from top-level context(s) - matchContext = addCombinator( function( elem ) { - return elem === checkContext; - }, implicitRelative, true ), - matchAnyContext = addCombinator( function( elem ) { - return indexOf( checkContext, elem ) > -1; - }, implicitRelative, true ), - matchers = [ function( elem, context, xml ) { - var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || ( - (checkContext = context).nodeType ? - matchContext( elem, context, xml ) : - matchAnyContext( elem, context, xml ) ); - // Avoid hanging onto element (issue #299) - checkContext = null; - return ret; - } ]; - - for ( ; i < len; i++ ) { - if ( (matcher = Expr.relative[ tokens[i].type ]) ) { - matchers = [ addCombinator(elementMatcher( matchers ), matcher) ]; - } else { - matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches ); - - // Return special upon seeing a positional matcher - if ( matcher[ expando ] ) { - // Find the next relative operator (if any) for proper handling - j = ++i; - for ( ; j < len; j++ ) { - if ( Expr.relative[ tokens[j].type ] ) { - break; - } - } - return setMatcher( - i > 1 && elementMatcher( matchers ), - i > 1 && toSelector( - // If the preceding token was a descendant combinator, insert an implicit any-element `*` - tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" }) - ).replace( rtrim, "$1" ), - matcher, - i < j && matcherFromTokens( tokens.slice( i, j ) ), - j < len && matcherFromTokens( (tokens = tokens.slice( j )) ), - j < len && toSelector( tokens ) - ); - } - matchers.push( matcher ); - } - } - - return elementMatcher( matchers ); -} - -function matcherFromGroupMatchers( elementMatchers, setMatchers ) { - var bySet = setMatchers.length > 0, - byElement = elementMatchers.length > 0, - superMatcher = function( seed, context, xml, results, outermost ) { - var elem, j, matcher, - matchedCount = 0, - i = "0", - unmatched = seed && [], - setMatched = [], - contextBackup = outermostContext, - // We must always have either seed elements or outermost context - elems = seed || byElement && Expr.find["TAG"]( "*", outermost ), - // Use integer dirruns iff this is the outermost matcher - dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1), - len = elems.length; - - if ( outermost ) { - outermostContext = context === document || context || outermost; - } - - // Add elements passing elementMatchers directly to results - // Support: IE<9, Safari - // Tolerate NodeList properties (IE: "length"; Safari: ) matching elements by id - for ( ; i !== len && (elem = elems[i]) != null; i++ ) { - if ( byElement && elem ) { - j = 0; - if ( !context && elem.ownerDocument !== document ) { - setDocument( elem ); - xml = !documentIsHTML; - } - while ( (matcher = elementMatchers[j++]) ) { - if ( matcher( elem, context || document, xml) ) { - results.push( elem ); - break; - } - } - if ( outermost ) { - dirruns = dirrunsUnique; - } - } - - // Track unmatched elements for set filters - if ( bySet ) { - // They will have gone through all possible matchers - if ( (elem = !matcher && elem) ) { - matchedCount--; - } - - // Lengthen the array for every element, matched or not - if ( seed ) { - unmatched.push( elem ); - } - } - } - - // `i` is now the count of elements visited above, and adding it to `matchedCount` - // makes the latter nonnegative. - matchedCount += i; - - // Apply set filters to unmatched elements - // NOTE: This can be skipped if there are no unmatched elements (i.e., `matchedCount` - // equals `i`), unless we didn't visit _any_ elements in the above loop because we have - // no element matchers and no seed. - // Incrementing an initially-string "0" `i` allows `i` to remain a string only in that - // case, which will result in a "00" `matchedCount` that differs from `i` but is also - // numerically zero. - if ( bySet && i !== matchedCount ) { - j = 0; - while ( (matcher = setMatchers[j++]) ) { - matcher( unmatched, setMatched, context, xml ); - } - - if ( seed ) { - // Reintegrate element matches to eliminate the need for sorting - if ( matchedCount > 0 ) { - while ( i-- ) { - if ( !(unmatched[i] || setMatched[i]) ) { - setMatched[i] = pop.call( results ); - } - } - } - - // Discard index placeholder values to get only actual matches - setMatched = condense( setMatched ); - } - - // Add matches to results - push.apply( results, setMatched ); - - // Seedless set matches succeeding multiple successful matchers stipulate sorting - if ( outermost && !seed && setMatched.length > 0 && - ( matchedCount + setMatchers.length ) > 1 ) { - - Sizzle.uniqueSort( results ); - } - } - - // Override manipulation of globals by nested matchers - if ( outermost ) { - dirruns = dirrunsUnique; - outermostContext = contextBackup; - } - - return unmatched; - }; - - return bySet ? - markFunction( superMatcher ) : - superMatcher; -} - -compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) { - var i, - setMatchers = [], - elementMatchers = [], - cached = compilerCache[ selector + " " ]; - - if ( !cached ) { - // Generate a function of recursive functions that can be used to check each element - if ( !match ) { - match = tokenize( selector ); - } - i = match.length; - while ( i-- ) { - cached = matcherFromTokens( match[i] ); - if ( cached[ expando ] ) { - setMatchers.push( cached ); - } else { - elementMatchers.push( cached ); - } - } - - // Cache the compiled function - cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) ); - - // Save selector and tokenization - cached.selector = selector; - } - return cached; -}; - -/** - * A low-level selection function that works with Sizzle's compiled - * selector functions - * @param {String|Function} selector A selector or a pre-compiled - * selector function built with Sizzle.compile - * @param {Element} context - * @param {Array} [results] - * @param {Array} [seed] A set of elements to match against - */ -select = Sizzle.select = function( selector, context, results, seed ) { - var i, tokens, token, type, find, - compiled = typeof selector === "function" && selector, - match = !seed && tokenize( (selector = compiled.selector || selector) ); - - results = results || []; - - // Try to minimize operations if there is only one selector in the list and no seed - // (the latter of which guarantees us context) - if ( match.length === 1 ) { - - // Reduce context if the leading compound selector is an ID - tokens = match[0] = match[0].slice( 0 ); - if ( tokens.length > 2 && (token = tokens[0]).type === "ID" && - support.getById && context.nodeType === 9 && documentIsHTML && - Expr.relative[ tokens[1].type ] ) { - - context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0]; - if ( !context ) { - return results; - - // Precompiled matchers will still verify ancestry, so step up a level - } else if ( compiled ) { - context = context.parentNode; - } - - selector = selector.slice( tokens.shift().value.length ); - } - - // Fetch a seed set for right-to-left matching - i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length; - while ( i-- ) { - token = tokens[i]; - - // Abort if we hit a combinator - if ( Expr.relative[ (type = token.type) ] ) { - break; - } - if ( (find = Expr.find[ type ]) ) { - // Search, expanding context for leading sibling combinators - if ( (seed = find( - token.matches[0].replace( runescape, funescape ), - rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context - )) ) { - - // If seed is empty or no tokens remain, we can return early - tokens.splice( i, 1 ); - selector = seed.length && toSelector( tokens ); - if ( !selector ) { - push.apply( results, seed ); - return results; - } - - break; - } - } - } - } - - // Compile and execute a filtering function if one is not provided - // Provide `match` to avoid retokenization if we modified the selector above - ( compiled || compile( selector, match ) )( - seed, - context, - !documentIsHTML, - results, - !context || rsibling.test( selector ) && testContext( context.parentNode ) || context - ); - return results; -}; - -// One-time assignments - -// Sort stability -support.sortStable = expando.split("").sort( sortOrder ).join("") === expando; - -// Support: Chrome 14-35+ -// Always assume duplicates if they aren't passed to the comparison function -support.detectDuplicates = !!hasDuplicate; - -// Initialize against the default document -setDocument(); - -// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27) -// Detached nodes confoundingly follow *each other* -support.sortDetached = assert(function( div1 ) { - // Should return 1, but returns 4 (following) - return div1.compareDocumentPosition( document.createElement("div") ) & 1; -}); - -// Support: IE<8 -// Prevent attribute/property "interpolation" -// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx -if ( !assert(function( div ) { - div.innerHTML = ""; - return div.firstChild.getAttribute("href") === "#" ; -}) ) { - addHandle( "type|href|height|width", function( elem, name, isXML ) { - if ( !isXML ) { - return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 ); - } - }); -} - -// Support: IE<9 -// Use defaultValue in place of getAttribute("value") -if ( !support.attributes || !assert(function( div ) { - div.innerHTML = ""; - div.firstChild.setAttribute( "value", "" ); - return div.firstChild.getAttribute( "value" ) === ""; -}) ) { - addHandle( "value", function( elem, name, isXML ) { - if ( !isXML && elem.nodeName.toLowerCase() === "input" ) { - return elem.defaultValue; - } - }); -} - -// Support: IE<9 -// Use getAttributeNode to fetch booleans when getAttribute lies -if ( !assert(function( div ) { - return div.getAttribute("disabled") == null; -}) ) { - addHandle( booleans, function( elem, name, isXML ) { - var val; - if ( !isXML ) { - return elem[ name ] === true ? name.toLowerCase() : - (val = elem.getAttributeNode( name )) && val.specified ? - val.value : - null; - } - }); -} - -return Sizzle; - -})( window ); - - - -jQuery.find = Sizzle; -jQuery.expr = Sizzle.selectors; -jQuery.expr[ ":" ] = jQuery.expr.pseudos; -jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort; -jQuery.text = Sizzle.getText; -jQuery.isXMLDoc = Sizzle.isXML; -jQuery.contains = Sizzle.contains; - - - -var dir = function( elem, dir, until ) { - var matched = [], - truncate = until !== undefined; - - while ( ( elem = elem[ dir ] ) && elem.nodeType !== 9 ) { - if ( elem.nodeType === 1 ) { - if ( truncate && jQuery( elem ).is( until ) ) { - break; - } - matched.push( elem ); - } - } - return matched; -}; - - -var siblings = function( n, elem ) { - var matched = []; - - for ( ; n; n = n.nextSibling ) { - if ( n.nodeType === 1 && n !== elem ) { - matched.push( n ); - } - } - - return matched; -}; - - -var rneedsContext = jQuery.expr.match.needsContext; - -var rsingleTag = ( /^<([\w-]+)\s*\/?>(?:<\/\1>|)$/ ); - - - -var risSimple = /^.[^:#\[\.,]*$/; - -// Implement the identical functionality for filter and not -function winnow( elements, qualifier, not ) { - if ( jQuery.isFunction( qualifier ) ) { - return jQuery.grep( elements, function( elem, i ) { - /* jshint -W018 */ - return !!qualifier.call( elem, i, elem ) !== not; - } ); - - } - - if ( qualifier.nodeType ) { - return jQuery.grep( elements, function( elem ) { - return ( elem === qualifier ) !== not; - } ); - - } - - if ( typeof qualifier === "string" ) { - if ( risSimple.test( qualifier ) ) { - return jQuery.filter( qualifier, elements, not ); - } - - qualifier = jQuery.filter( qualifier, elements ); - } - - return jQuery.grep( elements, function( elem ) { - return ( indexOf.call( qualifier, elem ) > -1 ) !== not; - } ); -} - -jQuery.filter = function( expr, elems, not ) { - var elem = elems[ 0 ]; - - if ( not ) { - expr = ":not(" + expr + ")"; - } - - return elems.length === 1 && elem.nodeType === 1 ? - jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] : - jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) { - return elem.nodeType === 1; - } ) ); -}; - -jQuery.fn.extend( { - find: function( selector ) { - var i, - len = this.length, - ret = [], - self = this; - - if ( typeof selector !== "string" ) { - return this.pushStack( jQuery( selector ).filter( function() { - for ( i = 0; i < len; i++ ) { - if ( jQuery.contains( self[ i ], this ) ) { - return true; - } - } - } ) ); - } - - for ( i = 0; i < len; i++ ) { - jQuery.find( selector, self[ i ], ret ); - } - - // Needed because $( selector, context ) becomes $( context ).find( selector ) - ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret ); - ret.selector = this.selector ? this.selector + " " + selector : selector; - return ret; - }, - filter: function( selector ) { - return this.pushStack( winnow( this, selector || [], false ) ); - }, - not: function( selector ) { - return this.pushStack( winnow( this, selector || [], true ) ); - }, - is: function( selector ) { - return !!winnow( - this, - - // If this is a positional/relative selector, check membership in the returned set - // so $("p:first").is("p:last") won't return true for a doc with two "p". - typeof selector === "string" && rneedsContext.test( selector ) ? - jQuery( selector ) : - selector || [], - false - ).length; - } -} ); - - -// Initialize a jQuery object - - -// A central reference to the root jQuery(document) -var rootjQuery, - - // A simple way to check for HTML strings - // Prioritize #id over to avoid XSS via location.hash (#9521) - // Strict HTML recognition (#11290: must start with <) - rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/, - - init = jQuery.fn.init = function( selector, context, root ) { - var match, elem; - - // HANDLE: $(""), $(null), $(undefined), $(false) - if ( !selector ) { - return this; - } - - // Method init() accepts an alternate rootjQuery - // so migrate can support jQuery.sub (gh-2101) - root = root || rootjQuery; - - // Handle HTML strings - if ( typeof selector === "string" ) { - if ( selector[ 0 ] === "<" && - selector[ selector.length - 1 ] === ">" && - selector.length >= 3 ) { - - // Assume that strings that start and end with <> are HTML and skip the regex check - match = [ null, selector, null ]; - - } else { - match = rquickExpr.exec( selector ); - } - - // Match html or make sure no context is specified for #id - if ( match && ( match[ 1 ] || !context ) ) { - - // HANDLE: $(html) -> $(array) - if ( match[ 1 ] ) { - context = context instanceof jQuery ? context[ 0 ] : context; - - // Option to run scripts is true for back-compat - // Intentionally let the error be thrown if parseHTML is not present - jQuery.merge( this, jQuery.parseHTML( - match[ 1 ], - context && context.nodeType ? context.ownerDocument || context : document, - true - ) ); - - // HANDLE: $(html, props) - if ( rsingleTag.test( match[ 1 ] ) && jQuery.isPlainObject( context ) ) { - for ( match in context ) { - - // Properties of context are called as methods if possible - if ( jQuery.isFunction( this[ match ] ) ) { - this[ match ]( context[ match ] ); - - // ...and otherwise set as attributes - } else { - this.attr( match, context[ match ] ); - } - } - } - - return this; - - // HANDLE: $(#id) - } else { - elem = document.getElementById( match[ 2 ] ); - - // Support: Blackberry 4.6 - // gEBID returns nodes no longer in the document (#6963) - if ( elem && elem.parentNode ) { - - // Inject the element directly into the jQuery object - this.length = 1; - this[ 0 ] = elem; - } - - this.context = document; - this.selector = selector; - return this; - } - - // HANDLE: $(expr, $(...)) - } else if ( !context || context.jquery ) { - return ( context || root ).find( selector ); - - // HANDLE: $(expr, context) - // (which is just equivalent to: $(context).find(expr) - } else { - return this.constructor( context ).find( selector ); - } - - // HANDLE: $(DOMElement) - } else if ( selector.nodeType ) { - this.context = this[ 0 ] = selector; - this.length = 1; - return this; - - // HANDLE: $(function) - // Shortcut for document ready - } else if ( jQuery.isFunction( selector ) ) { - return root.ready !== undefined ? - root.ready( selector ) : - - // Execute immediately if ready is not present - selector( jQuery ); - } - - if ( selector.selector !== undefined ) { - this.selector = selector.selector; - this.context = selector.context; - } - - return jQuery.makeArray( selector, this ); - }; - -// Give the init function the jQuery prototype for later instantiation -init.prototype = jQuery.fn; - -// Initialize central reference -rootjQuery = jQuery( document ); - - -var rparentsprev = /^(?:parents|prev(?:Until|All))/, - - // Methods guaranteed to produce a unique set when starting from a unique set - guaranteedUnique = { - children: true, - contents: true, - next: true, - prev: true - }; - -jQuery.fn.extend( { - has: function( target ) { - var targets = jQuery( target, this ), - l = targets.length; - - return this.filter( function() { - var i = 0; - for ( ; i < l; i++ ) { - if ( jQuery.contains( this, targets[ i ] ) ) { - return true; - } - } - } ); - }, - - closest: function( selectors, context ) { - var cur, - i = 0, - l = this.length, - matched = [], - pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ? - jQuery( selectors, context || this.context ) : - 0; - - for ( ; i < l; i++ ) { - for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) { - - // Always skip document fragments - if ( cur.nodeType < 11 && ( pos ? - pos.index( cur ) > -1 : - - // Don't pass non-elements to Sizzle - cur.nodeType === 1 && - jQuery.find.matchesSelector( cur, selectors ) ) ) { - - matched.push( cur ); - break; - } - } - } - - return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched ); - }, - - // Determine the position of an element within the set - index: function( elem ) { - - // No argument, return index in parent - if ( !elem ) { - return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1; - } - - // Index in selector - if ( typeof elem === "string" ) { - return indexOf.call( jQuery( elem ), this[ 0 ] ); - } - - // Locate the position of the desired element - return indexOf.call( this, - - // If it receives a jQuery object, the first element is used - elem.jquery ? elem[ 0 ] : elem - ); - }, - - add: function( selector, context ) { - return this.pushStack( - jQuery.uniqueSort( - jQuery.merge( this.get(), jQuery( selector, context ) ) - ) - ); - }, - - addBack: function( selector ) { - return this.add( selector == null ? - this.prevObject : this.prevObject.filter( selector ) - ); - } -} ); - -function sibling( cur, dir ) { - while ( ( cur = cur[ dir ] ) && cur.nodeType !== 1 ) {} - return cur; -} - -jQuery.each( { - parent: function( elem ) { - var parent = elem.parentNode; - return parent && parent.nodeType !== 11 ? parent : null; - }, - parents: function( elem ) { - return dir( elem, "parentNode" ); - }, - parentsUntil: function( elem, i, until ) { - return dir( elem, "parentNode", until ); - }, - next: function( elem ) { - return sibling( elem, "nextSibling" ); - }, - prev: function( elem ) { - return sibling( elem, "previousSibling" ); - }, - nextAll: function( elem ) { - return dir( elem, "nextSibling" ); - }, - prevAll: function( elem ) { - return dir( elem, "previousSibling" ); - }, - nextUntil: function( elem, i, until ) { - return dir( elem, "nextSibling", until ); - }, - prevUntil: function( elem, i, until ) { - return dir( elem, "previousSibling", until ); - }, - siblings: function( elem ) { - return siblings( ( elem.parentNode || {} ).firstChild, elem ); - }, - children: function( elem ) { - return siblings( elem.firstChild ); - }, - contents: function( elem ) { - return elem.contentDocument || jQuery.merge( [], elem.childNodes ); - } -}, function( name, fn ) { - jQuery.fn[ name ] = function( until, selector ) { - var matched = jQuery.map( this, fn, until ); - - if ( name.slice( -5 ) !== "Until" ) { - selector = until; - } - - if ( selector && typeof selector === "string" ) { - matched = jQuery.filter( selector, matched ); - } - - if ( this.length > 1 ) { - - // Remove duplicates - if ( !guaranteedUnique[ name ] ) { - jQuery.uniqueSort( matched ); - } - - // Reverse order for parents* and prev-derivatives - if ( rparentsprev.test( name ) ) { - matched.reverse(); - } - } - - return this.pushStack( matched ); - }; -} ); -var rnotwhite = ( /\S+/g ); - - - -// Convert String-formatted options into Object-formatted ones -function createOptions( options ) { - var object = {}; - jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) { - object[ flag ] = true; - } ); - return object; -} - -/* - * Create a callback list using the following parameters: - * - * options: an optional list of space-separated options that will change how - * the callback list behaves or a more traditional option object - * - * By default a callback list will act like an event callback list and can be - * "fired" multiple times. - * - * Possible options: - * - * once: will ensure the callback list can only be fired once (like a Deferred) - * - * memory: will keep track of previous values and will call any callback added - * after the list has been fired right away with the latest "memorized" - * values (like a Deferred) - * - * unique: will ensure a callback can only be added once (no duplicate in the list) - * - * stopOnFalse: interrupt callings when a callback returns false - * - */ -jQuery.Callbacks = function( options ) { - - // Convert options from String-formatted to Object-formatted if needed - // (we check in cache first) - options = typeof options === "string" ? - createOptions( options ) : - jQuery.extend( {}, options ); - - var // Flag to know if list is currently firing - firing, - - // Last fire value for non-forgettable lists - memory, - - // Flag to know if list was already fired - fired, - - // Flag to prevent firing - locked, - - // Actual callback list - list = [], - - // Queue of execution data for repeatable lists - queue = [], - - // Index of currently firing callback (modified by add/remove as needed) - firingIndex = -1, - - // Fire callbacks - fire = function() { - - // Enforce single-firing - locked = options.once; - - // Execute callbacks for all pending executions, - // respecting firingIndex overrides and runtime changes - fired = firing = true; - for ( ; queue.length; firingIndex = -1 ) { - memory = queue.shift(); - while ( ++firingIndex < list.length ) { - - // Run callback and check for early termination - if ( list[ firingIndex ].apply( memory[ 0 ], memory[ 1 ] ) === false && - options.stopOnFalse ) { - - // Jump to end and forget the data so .add doesn't re-fire - firingIndex = list.length; - memory = false; - } - } - } - - // Forget the data if we're done with it - if ( !options.memory ) { - memory = false; - } - - firing = false; - - // Clean up if we're done firing for good - if ( locked ) { - - // Keep an empty list if we have data for future add calls - if ( memory ) { - list = []; - - // Otherwise, this object is spent - } else { - list = ""; - } - } - }, - - // Actual Callbacks object - self = { - - // Add a callback or a collection of callbacks to the list - add: function() { - if ( list ) { - - // If we have memory from a past run, we should fire after adding - if ( memory && !firing ) { - firingIndex = list.length - 1; - queue.push( memory ); - } - - ( function add( args ) { - jQuery.each( args, function( _, arg ) { - if ( jQuery.isFunction( arg ) ) { - if ( !options.unique || !self.has( arg ) ) { - list.push( arg ); - } - } else if ( arg && arg.length && jQuery.type( arg ) !== "string" ) { - - // Inspect recursively - add( arg ); - } - } ); - } )( arguments ); - - if ( memory && !firing ) { - fire(); - } - } - return this; - }, - - // Remove a callback from the list - remove: function() { - jQuery.each( arguments, function( _, arg ) { - var index; - while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) { - list.splice( index, 1 ); - - // Handle firing indexes - if ( index <= firingIndex ) { - firingIndex--; - } - } - } ); - return this; - }, - - // Check if a given callback is in the list. - // If no argument is given, return whether or not list has callbacks attached. - has: function( fn ) { - return fn ? - jQuery.inArray( fn, list ) > -1 : - list.length > 0; - }, - - // Remove all callbacks from the list - empty: function() { - if ( list ) { - list = []; - } - return this; - }, - - // Disable .fire and .add - // Abort any current/pending executions - // Clear all callbacks and values - disable: function() { - locked = queue = []; - list = memory = ""; - return this; - }, - disabled: function() { - return !list; - }, - - // Disable .fire - // Also disable .add unless we have memory (since it would have no effect) - // Abort any pending executions - lock: function() { - locked = queue = []; - if ( !memory ) { - list = memory = ""; - } - return this; - }, - locked: function() { - return !!locked; - }, - - // Call all callbacks with the given context and arguments - fireWith: function( context, args ) { - if ( !locked ) { - args = args || []; - args = [ context, args.slice ? args.slice() : args ]; - queue.push( args ); - if ( !firing ) { - fire(); - } - } - return this; - }, - - // Call all the callbacks with the given arguments - fire: function() { - self.fireWith( this, arguments ); - return this; - }, - - // To know if the callbacks have already been called at least once - fired: function() { - return !!fired; - } - }; - - return self; -}; - - -jQuery.extend( { - - Deferred: function( func ) { - var tuples = [ - - // action, add listener, listener list, final state - [ "resolve", "done", jQuery.Callbacks( "once memory" ), "resolved" ], - [ "reject", "fail", jQuery.Callbacks( "once memory" ), "rejected" ], - [ "notify", "progress", jQuery.Callbacks( "memory" ) ] - ], - state = "pending", - promise = { - state: function() { - return state; - }, - always: function() { - deferred.done( arguments ).fail( arguments ); - return this; - }, - then: function( /* fnDone, fnFail, fnProgress */ ) { - var fns = arguments; - return jQuery.Deferred( function( newDefer ) { - jQuery.each( tuples, function( i, tuple ) { - var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ]; - - // deferred[ done | fail | progress ] for forwarding actions to newDefer - deferred[ tuple[ 1 ] ]( function() { - var returned = fn && fn.apply( this, arguments ); - if ( returned && jQuery.isFunction( returned.promise ) ) { - returned.promise() - .progress( newDefer.notify ) - .done( newDefer.resolve ) - .fail( newDefer.reject ); - } else { - newDefer[ tuple[ 0 ] + "With" ]( - this === promise ? newDefer.promise() : this, - fn ? [ returned ] : arguments - ); - } - } ); - } ); - fns = null; - } ).promise(); - }, - - // Get a promise for this deferred - // If obj is provided, the promise aspect is added to the object - promise: function( obj ) { - return obj != null ? jQuery.extend( obj, promise ) : promise; - } - }, - deferred = {}; - - // Keep pipe for back-compat - promise.pipe = promise.then; - - // Add list-specific methods - jQuery.each( tuples, function( i, tuple ) { - var list = tuple[ 2 ], - stateString = tuple[ 3 ]; - - // promise[ done | fail | progress ] = list.add - promise[ tuple[ 1 ] ] = list.add; - - // Handle state - if ( stateString ) { - list.add( function() { - - // state = [ resolved | rejected ] - state = stateString; - - // [ reject_list | resolve_list ].disable; progress_list.lock - }, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock ); - } - - // deferred[ resolve | reject | notify ] - deferred[ tuple[ 0 ] ] = function() { - deferred[ tuple[ 0 ] + "With" ]( this === deferred ? promise : this, arguments ); - return this; - }; - deferred[ tuple[ 0 ] + "With" ] = list.fireWith; - } ); - - // Make the deferred a promise - promise.promise( deferred ); - - // Call given func if any - if ( func ) { - func.call( deferred, deferred ); - } - - // All done! - return deferred; - }, - - // Deferred helper - when: function( subordinate /* , ..., subordinateN */ ) { - var i = 0, - resolveValues = slice.call( arguments ), - length = resolveValues.length, - - // the count of uncompleted subordinates - remaining = length !== 1 || - ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0, - - // the master Deferred. - // If resolveValues consist of only a single Deferred, just use that. - deferred = remaining === 1 ? subordinate : jQuery.Deferred(), - - // Update function for both resolve and progress values - updateFunc = function( i, contexts, values ) { - return function( value ) { - contexts[ i ] = this; - values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value; - if ( values === progressValues ) { - deferred.notifyWith( contexts, values ); - } else if ( !( --remaining ) ) { - deferred.resolveWith( contexts, values ); - } - }; - }, - - progressValues, progressContexts, resolveContexts; - - // Add listeners to Deferred subordinates; treat others as resolved - if ( length > 1 ) { - progressValues = new Array( length ); - progressContexts = new Array( length ); - resolveContexts = new Array( length ); - for ( ; i < length; i++ ) { - if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) { - resolveValues[ i ].promise() - .progress( updateFunc( i, progressContexts, progressValues ) ) - .done( updateFunc( i, resolveContexts, resolveValues ) ) - .fail( deferred.reject ); - } else { - --remaining; - } - } - } - - // If we're not waiting on anything, resolve the master - if ( !remaining ) { - deferred.resolveWith( resolveContexts, resolveValues ); - } - - return deferred.promise(); - } -} ); - - -// The deferred used on DOM ready -var readyList; - -jQuery.fn.ready = function( fn ) { - - // Add the callback - jQuery.ready.promise().done( fn ); - - return this; -}; - -jQuery.extend( { - - // Is the DOM ready to be used? Set to true once it occurs. - isReady: false, - - // A counter to track how many items to wait for before - // the ready event fires. See #6781 - readyWait: 1, - - // Hold (or release) the ready event - holdReady: function( hold ) { - if ( hold ) { - jQuery.readyWait++; - } else { - jQuery.ready( true ); - } - }, - - // Handle when the DOM is ready - ready: function( wait ) { - - // Abort if there are pending holds or we're already ready - if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) { - return; - } - - // Remember that the DOM is ready - jQuery.isReady = true; - - // If a normal DOM Ready event fired, decrement, and wait if need be - if ( wait !== true && --jQuery.readyWait > 0 ) { - return; - } - - // If there are functions bound, to execute - readyList.resolveWith( document, [ jQuery ] ); - - // Trigger any bound ready events - if ( jQuery.fn.triggerHandler ) { - jQuery( document ).triggerHandler( "ready" ); - jQuery( document ).off( "ready" ); - } - } -} ); - -/** - * The ready event handler and self cleanup method - */ -function completed() { - document.removeEventListener( "DOMContentLoaded", completed ); - window.removeEventListener( "load", completed ); - jQuery.ready(); -} - -jQuery.ready.promise = function( obj ) { - if ( !readyList ) { - - readyList = jQuery.Deferred(); - - // Catch cases where $(document).ready() is called - // after the browser event has already occurred. - // Support: IE9-10 only - // Older IE sometimes signals "interactive" too soon - if ( document.readyState === "complete" || - ( document.readyState !== "loading" && !document.documentElement.doScroll ) ) { - - // Handle it asynchronously to allow scripts the opportunity to delay ready - window.setTimeout( jQuery.ready ); - - } else { - - // Use the handy event callback - document.addEventListener( "DOMContentLoaded", completed ); - - // A fallback to window.onload, that will always work - window.addEventListener( "load", completed ); - } - } - return readyList.promise( obj ); -}; - -// Kick off the DOM ready check even if the user does not -jQuery.ready.promise(); - - - - -// Multifunctional method to get and set values of a collection -// The value/s can optionally be executed if it's a function -var access = function( elems, fn, key, value, chainable, emptyGet, raw ) { - var i = 0, - len = elems.length, - bulk = key == null; - - // Sets many values - if ( jQuery.type( key ) === "object" ) { - chainable = true; - for ( i in key ) { - access( elems, fn, i, key[ i ], true, emptyGet, raw ); - } - - // Sets one value - } else if ( value !== undefined ) { - chainable = true; - - if ( !jQuery.isFunction( value ) ) { - raw = true; - } - - if ( bulk ) { - - // Bulk operations run against the entire set - if ( raw ) { - fn.call( elems, value ); - fn = null; - - // ...except when executing function values - } else { - bulk = fn; - fn = function( elem, key, value ) { - return bulk.call( jQuery( elem ), value ); - }; - } - } - - if ( fn ) { - for ( ; i < len; i++ ) { - fn( - elems[ i ], key, raw ? - value : - value.call( elems[ i ], i, fn( elems[ i ], key ) ) - ); - } - } - } - - return chainable ? - elems : - - // Gets - bulk ? - fn.call( elems ) : - len ? fn( elems[ 0 ], key ) : emptyGet; -}; -var acceptData = function( owner ) { - - // Accepts only: - // - Node - // - Node.ELEMENT_NODE - // - Node.DOCUMENT_NODE - // - Object - // - Any - /* jshint -W018 */ - return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType ); -}; - - - - -function Data() { - this.expando = jQuery.expando + Data.uid++; -} - -Data.uid = 1; - -Data.prototype = { - - register: function( owner, initial ) { - var value = initial || {}; - - // If it is a node unlikely to be stringify-ed or looped over - // use plain assignment - if ( owner.nodeType ) { - owner[ this.expando ] = value; - - // Otherwise secure it in a non-enumerable, non-writable property - // configurability must be true to allow the property to be - // deleted with the delete operator - } else { - Object.defineProperty( owner, this.expando, { - value: value, - writable: true, - configurable: true - } ); - } - return owner[ this.expando ]; - }, - cache: function( owner ) { - - // We can accept data for non-element nodes in modern browsers, - // but we should not, see #8335. - // Always return an empty object. - if ( !acceptData( owner ) ) { - return {}; - } - - // Check if the owner object already has a cache - var value = owner[ this.expando ]; - - // If not, create one - if ( !value ) { - value = {}; - - // We can accept data for non-element nodes in modern browsers, - // but we should not, see #8335. - // Always return an empty object. - if ( acceptData( owner ) ) { - - // If it is a node unlikely to be stringify-ed or looped over - // use plain assignment - if ( owner.nodeType ) { - owner[ this.expando ] = value; - - // Otherwise secure it in a non-enumerable property - // configurable must be true to allow the property to be - // deleted when data is removed - } else { - Object.defineProperty( owner, this.expando, { - value: value, - configurable: true - } ); - } - } - } - - return value; - }, - set: function( owner, data, value ) { - var prop, - cache = this.cache( owner ); - - // Handle: [ owner, key, value ] args - if ( typeof data === "string" ) { - cache[ data ] = value; - - // Handle: [ owner, { properties } ] args - } else { - - // Copy the properties one-by-one to the cache object - for ( prop in data ) { - cache[ prop ] = data[ prop ]; - } - } - return cache; - }, - get: function( owner, key ) { - return key === undefined ? - this.cache( owner ) : - owner[ this.expando ] && owner[ this.expando ][ key ]; - }, - access: function( owner, key, value ) { - var stored; - - // In cases where either: - // - // 1. No key was specified - // 2. A string key was specified, but no value provided - // - // Take the "read" path and allow the get method to determine - // which value to return, respectively either: - // - // 1. The entire cache object - // 2. The data stored at the key - // - if ( key === undefined || - ( ( key && typeof key === "string" ) && value === undefined ) ) { - - stored = this.get( owner, key ); - - return stored !== undefined ? - stored : this.get( owner, jQuery.camelCase( key ) ); - } - - // When the key is not a string, or both a key and value - // are specified, set or extend (existing objects) with either: - // - // 1. An object of properties - // 2. A key and value - // - this.set( owner, key, value ); - - // Since the "set" path can have two possible entry points - // return the expected data based on which path was taken[*] - return value !== undefined ? value : key; - }, - remove: function( owner, key ) { - var i, name, camel, - cache = owner[ this.expando ]; - - if ( cache === undefined ) { - return; - } - - if ( key === undefined ) { - this.register( owner ); - - } else { - - // Support array or space separated string of keys - if ( jQuery.isArray( key ) ) { - - // If "name" is an array of keys... - // When data is initially created, via ("key", "val") signature, - // keys will be converted to camelCase. - // Since there is no way to tell _how_ a key was added, remove - // both plain key and camelCase key. #12786 - // This will only penalize the array argument path. - name = key.concat( key.map( jQuery.camelCase ) ); - } else { - camel = jQuery.camelCase( key ); - - // Try the string as a key before any manipulation - if ( key in cache ) { - name = [ key, camel ]; - } else { - - // If a key with the spaces exists, use it. - // Otherwise, create an array by matching non-whitespace - name = camel; - name = name in cache ? - [ name ] : ( name.match( rnotwhite ) || [] ); - } - } - - i = name.length; - - while ( i-- ) { - delete cache[ name[ i ] ]; - } - } - - // Remove the expando if there's no more data - if ( key === undefined || jQuery.isEmptyObject( cache ) ) { - - // Support: Chrome <= 35-45+ - // Webkit & Blink performance suffers when deleting properties - // from DOM nodes, so set to undefined instead - // https://code.google.com/p/chromium/issues/detail?id=378607 - if ( owner.nodeType ) { - owner[ this.expando ] = undefined; - } else { - delete owner[ this.expando ]; - } - } - }, - hasData: function( owner ) { - var cache = owner[ this.expando ]; - return cache !== undefined && !jQuery.isEmptyObject( cache ); - } -}; -var dataPriv = new Data(); - -var dataUser = new Data(); - - - -// Implementation Summary -// -// 1. Enforce API surface and semantic compatibility with 1.9.x branch -// 2. Improve the module's maintainability by reducing the storage -// paths to a single mechanism. -// 3. Use the same single mechanism to support "private" and "user" data. -// 4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData) -// 5. Avoid exposing implementation details on user objects (eg. expando properties) -// 6. Provide a clear path for implementation upgrade to WeakMap in 2014 - -var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/, - rmultiDash = /[A-Z]/g; - -function dataAttr( elem, key, data ) { - var name; - - // If nothing was found internally, try to fetch any - // data from the HTML5 data-* attribute - if ( data === undefined && elem.nodeType === 1 ) { - name = "data-" + key.replace( rmultiDash, "-$&" ).toLowerCase(); - data = elem.getAttribute( name ); - - if ( typeof data === "string" ) { - try { - data = data === "true" ? true : - data === "false" ? false : - data === "null" ? null : - - // Only convert to a number if it doesn't change the string - +data + "" === data ? +data : - rbrace.test( data ) ? jQuery.parseJSON( data ) : - data; - } catch ( e ) {} - - // Make sure we set the data so it isn't changed later - dataUser.set( elem, key, data ); - } else { - data = undefined; - } - } - return data; -} - -jQuery.extend( { - hasData: function( elem ) { - return dataUser.hasData( elem ) || dataPriv.hasData( elem ); - }, - - data: function( elem, name, data ) { - return dataUser.access( elem, name, data ); - }, - - removeData: function( elem, name ) { - dataUser.remove( elem, name ); - }, - - // TODO: Now that all calls to _data and _removeData have been replaced - // with direct calls to dataPriv methods, these can be deprecated. - _data: function( elem, name, data ) { - return dataPriv.access( elem, name, data ); - }, - - _removeData: function( elem, name ) { - dataPriv.remove( elem, name ); - } -} ); - -jQuery.fn.extend( { - data: function( key, value ) { - var i, name, data, - elem = this[ 0 ], - attrs = elem && elem.attributes; - - // Gets all values - if ( key === undefined ) { - if ( this.length ) { - data = dataUser.get( elem ); - - if ( elem.nodeType === 1 && !dataPriv.get( elem, "hasDataAttrs" ) ) { - i = attrs.length; - while ( i-- ) { - - // Support: IE11+ - // The attrs elements can be null (#14894) - if ( attrs[ i ] ) { - name = attrs[ i ].name; - if ( name.indexOf( "data-" ) === 0 ) { - name = jQuery.camelCase( name.slice( 5 ) ); - dataAttr( elem, name, data[ name ] ); - } - } - } - dataPriv.set( elem, "hasDataAttrs", true ); - } - } - - return data; - } - - // Sets multiple values - if ( typeof key === "object" ) { - return this.each( function() { - dataUser.set( this, key ); - } ); - } - - return access( this, function( value ) { - var data, camelKey; - - // The calling jQuery object (element matches) is not empty - // (and therefore has an element appears at this[ 0 ]) and the - // `value` parameter was not undefined. An empty jQuery object - // will result in `undefined` for elem = this[ 0 ] which will - // throw an exception if an attempt to read a data cache is made. - if ( elem && value === undefined ) { - - // Attempt to get data from the cache - // with the key as-is - data = dataUser.get( elem, key ) || - - // Try to find dashed key if it exists (gh-2779) - // This is for 2.2.x only - dataUser.get( elem, key.replace( rmultiDash, "-$&" ).toLowerCase() ); - - if ( data !== undefined ) { - return data; - } - - camelKey = jQuery.camelCase( key ); - - // Attempt to get data from the cache - // with the key camelized - data = dataUser.get( elem, camelKey ); - if ( data !== undefined ) { - return data; - } - - // Attempt to "discover" the data in - // HTML5 custom data-* attrs - data = dataAttr( elem, camelKey, undefined ); - if ( data !== undefined ) { - return data; - } - - // We tried really hard, but the data doesn't exist. - return; - } - - // Set the data... - camelKey = jQuery.camelCase( key ); - this.each( function() { - - // First, attempt to store a copy or reference of any - // data that might've been store with a camelCased key. - var data = dataUser.get( this, camelKey ); - - // For HTML5 data-* attribute interop, we have to - // store property names with dashes in a camelCase form. - // This might not apply to all properties...* - dataUser.set( this, camelKey, value ); - - // *... In the case of properties that might _actually_ - // have dashes, we need to also store a copy of that - // unchanged property. - if ( key.indexOf( "-" ) > -1 && data !== undefined ) { - dataUser.set( this, key, value ); - } - } ); - }, null, value, arguments.length > 1, null, true ); - }, - - removeData: function( key ) { - return this.each( function() { - dataUser.remove( this, key ); - } ); - } -} ); - - -jQuery.extend( { - queue: function( elem, type, data ) { - var queue; - - if ( elem ) { - type = ( type || "fx" ) + "queue"; - queue = dataPriv.get( elem, type ); - - // Speed up dequeue by getting out quickly if this is just a lookup - if ( data ) { - if ( !queue || jQuery.isArray( data ) ) { - queue = dataPriv.access( elem, type, jQuery.makeArray( data ) ); - } else { - queue.push( data ); - } - } - return queue || []; - } - }, - - dequeue: function( elem, type ) { - type = type || "fx"; - - var queue = jQuery.queue( elem, type ), - startLength = queue.length, - fn = queue.shift(), - hooks = jQuery._queueHooks( elem, type ), - next = function() { - jQuery.dequeue( elem, type ); - }; - - // If the fx queue is dequeued, always remove the progress sentinel - if ( fn === "inprogress" ) { - fn = queue.shift(); - startLength--; - } - - if ( fn ) { - - // Add a progress sentinel to prevent the fx queue from being - // automatically dequeued - if ( type === "fx" ) { - queue.unshift( "inprogress" ); - } - - // Clear up the last queue stop function - delete hooks.stop; - fn.call( elem, next, hooks ); - } - - if ( !startLength && hooks ) { - hooks.empty.fire(); - } - }, - - // Not public - generate a queueHooks object, or return the current one - _queueHooks: function( elem, type ) { - var key = type + "queueHooks"; - return dataPriv.get( elem, key ) || dataPriv.access( elem, key, { - empty: jQuery.Callbacks( "once memory" ).add( function() { - dataPriv.remove( elem, [ type + "queue", key ] ); - } ) - } ); - } -} ); - -jQuery.fn.extend( { - queue: function( type, data ) { - var setter = 2; - - if ( typeof type !== "string" ) { - data = type; - type = "fx"; - setter--; - } - - if ( arguments.length < setter ) { - return jQuery.queue( this[ 0 ], type ); - } - - return data === undefined ? - this : - this.each( function() { - var queue = jQuery.queue( this, type, data ); - - // Ensure a hooks for this queue - jQuery._queueHooks( this, type ); - - if ( type === "fx" && queue[ 0 ] !== "inprogress" ) { - jQuery.dequeue( this, type ); - } - } ); - }, - dequeue: function( type ) { - return this.each( function() { - jQuery.dequeue( this, type ); - } ); - }, - clearQueue: function( type ) { - return this.queue( type || "fx", [] ); - }, - - // Get a promise resolved when queues of a certain type - // are emptied (fx is the type by default) - promise: function( type, obj ) { - var tmp, - count = 1, - defer = jQuery.Deferred(), - elements = this, - i = this.length, - resolve = function() { - if ( !( --count ) ) { - defer.resolveWith( elements, [ elements ] ); - } - }; - - if ( typeof type !== "string" ) { - obj = type; - type = undefined; - } - type = type || "fx"; - - while ( i-- ) { - tmp = dataPriv.get( elements[ i ], type + "queueHooks" ); - if ( tmp && tmp.empty ) { - count++; - tmp.empty.add( resolve ); - } - } - resolve(); - return defer.promise( obj ); - } -} ); -var pnum = ( /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/ ).source; - -var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" ); - - -var cssExpand = [ "Top", "Right", "Bottom", "Left" ]; - -var isHidden = function( elem, el ) { - - // isHidden might be called from jQuery#filter function; - // in that case, element will be second argument - elem = el || elem; - return jQuery.css( elem, "display" ) === "none" || - !jQuery.contains( elem.ownerDocument, elem ); - }; - - - -function adjustCSS( elem, prop, valueParts, tween ) { - var adjusted, - scale = 1, - maxIterations = 20, - currentValue = tween ? - function() { return tween.cur(); } : - function() { return jQuery.css( elem, prop, "" ); }, - initial = currentValue(), - unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ), - - // Starting value computation is required for potential unit mismatches - initialInUnit = ( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) && - rcssNum.exec( jQuery.css( elem, prop ) ); - - if ( initialInUnit && initialInUnit[ 3 ] !== unit ) { - - // Trust units reported by jQuery.css - unit = unit || initialInUnit[ 3 ]; - - // Make sure we update the tween properties later on - valueParts = valueParts || []; - - // Iteratively approximate from a nonzero starting point - initialInUnit = +initial || 1; - - do { - - // If previous iteration zeroed out, double until we get *something*. - // Use string for doubling so we don't accidentally see scale as unchanged below - scale = scale || ".5"; - - // Adjust and apply - initialInUnit = initialInUnit / scale; - jQuery.style( elem, prop, initialInUnit + unit ); - - // Update scale, tolerating zero or NaN from tween.cur() - // Break the loop if scale is unchanged or perfect, or if we've just had enough. - } while ( - scale !== ( scale = currentValue() / initial ) && scale !== 1 && --maxIterations - ); - } - - if ( valueParts ) { - initialInUnit = +initialInUnit || +initial || 0; - - // Apply relative offset (+=/-=) if specified - adjusted = valueParts[ 1 ] ? - initialInUnit + ( valueParts[ 1 ] + 1 ) * valueParts[ 2 ] : - +valueParts[ 2 ]; - if ( tween ) { - tween.unit = unit; - tween.start = initialInUnit; - tween.end = adjusted; - } - } - return adjusted; -} -var rcheckableType = ( /^(?:checkbox|radio)$/i ); - -var rtagName = ( /<([\w:-]+)/ ); - -var rscriptType = ( /^$|\/(?:java|ecma)script/i ); - - - -// We have to close these tags to support XHTML (#13200) -var wrapMap = { - - // Support: IE9 - option: [ 1, "" ], - - // XHTML parsers do not magically insert elements in the - // same way that tag soup parsers do. So we cannot shorten - // this by omitting or other required elements. - thead: [ 1, "", "
" ], - col: [ 2, "", "
" ], - tr: [ 2, "", "
" ], - td: [ 3, "", "
" ], - - _default: [ 0, "", "" ] -}; - -// Support: IE9 -wrapMap.optgroup = wrapMap.option; - -wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; -wrapMap.th = wrapMap.td; - - -function getAll( context, tag ) { - - // Support: IE9-11+ - // Use typeof to avoid zero-argument method invocation on host objects (#15151) - var ret = typeof context.getElementsByTagName !== "undefined" ? - context.getElementsByTagName( tag || "*" ) : - typeof context.querySelectorAll !== "undefined" ? - context.querySelectorAll( tag || "*" ) : - []; - - return tag === undefined || tag && jQuery.nodeName( context, tag ) ? - jQuery.merge( [ context ], ret ) : - ret; -} - - -// Mark scripts as having already been evaluated -function setGlobalEval( elems, refElements ) { - var i = 0, - l = elems.length; - - for ( ; i < l; i++ ) { - dataPriv.set( - elems[ i ], - "globalEval", - !refElements || dataPriv.get( refElements[ i ], "globalEval" ) - ); - } -} - - -var rhtml = /<|&#?\w+;/; - -function buildFragment( elems, context, scripts, selection, ignored ) { - var elem, tmp, tag, wrap, contains, j, - fragment = context.createDocumentFragment(), - nodes = [], - i = 0, - l = elems.length; - - for ( ; i < l; i++ ) { - elem = elems[ i ]; - - if ( elem || elem === 0 ) { - - // Add nodes directly - if ( jQuery.type( elem ) === "object" ) { - - // Support: Android<4.1, PhantomJS<2 - // push.apply(_, arraylike) throws on ancient WebKit - jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem ); - - // Convert non-html into a text node - } else if ( !rhtml.test( elem ) ) { - nodes.push( context.createTextNode( elem ) ); - - // Convert html into DOM nodes - } else { - tmp = tmp || fragment.appendChild( context.createElement( "div" ) ); - - // Deserialize a standard representation - tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase(); - wrap = wrapMap[ tag ] || wrapMap._default; - tmp.innerHTML = wrap[ 1 ] + jQuery.htmlPrefilter( elem ) + wrap[ 2 ]; - - // Descend through wrappers to the right content - j = wrap[ 0 ]; - while ( j-- ) { - tmp = tmp.lastChild; - } - - // Support: Android<4.1, PhantomJS<2 - // push.apply(_, arraylike) throws on ancient WebKit - jQuery.merge( nodes, tmp.childNodes ); - - // Remember the top-level container - tmp = fragment.firstChild; - - // Ensure the created nodes are orphaned (#12392) - tmp.textContent = ""; - } - } - } - - // Remove wrapper from fragment - fragment.textContent = ""; - - i = 0; - while ( ( elem = nodes[ i++ ] ) ) { - - // Skip elements already in the context collection (trac-4087) - if ( selection && jQuery.inArray( elem, selection ) > -1 ) { - if ( ignored ) { - ignored.push( elem ); - } - continue; - } - - contains = jQuery.contains( elem.ownerDocument, elem ); - - // Append to fragment - tmp = getAll( fragment.appendChild( elem ), "script" ); - - // Preserve script evaluation history - if ( contains ) { - setGlobalEval( tmp ); - } - - // Capture executables - if ( scripts ) { - j = 0; - while ( ( elem = tmp[ j++ ] ) ) { - if ( rscriptType.test( elem.type || "" ) ) { - scripts.push( elem ); - } - } - } - } - - return fragment; -} - - -( function() { - var fragment = document.createDocumentFragment(), - div = fragment.appendChild( document.createElement( "div" ) ), - input = document.createElement( "input" ); - - // Support: Android 4.0-4.3, Safari<=5.1 - // Check state lost if the name is set (#11217) - // Support: Windows Web Apps (WWA) - // `name` and `type` must use .setAttribute for WWA (#14901) - input.setAttribute( "type", "radio" ); - input.setAttribute( "checked", "checked" ); - input.setAttribute( "name", "t" ); - - div.appendChild( input ); - - // Support: Safari<=5.1, Android<4.2 - // Older WebKit doesn't clone checked state correctly in fragments - support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked; - - // Support: IE<=11+ - // Make sure textarea (and checkbox) defaultValue is properly cloned - div.innerHTML = ""; - support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue; -} )(); - - -var - rkeyEvent = /^key/, - rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/, - rtypenamespace = /^([^.]*)(?:\.(.+)|)/; - -function returnTrue() { - return true; -} - -function returnFalse() { - return false; -} - -// Support: IE9 -// See #13393 for more info -function safeActiveElement() { - try { - return document.activeElement; - } catch ( err ) { } -} - -function on( elem, types, selector, data, fn, one ) { - var origFn, type; - - // Types can be a map of types/handlers - if ( typeof types === "object" ) { - - // ( types-Object, selector, data ) - if ( typeof selector !== "string" ) { - - // ( types-Object, data ) - data = data || selector; - selector = undefined; - } - for ( type in types ) { - on( elem, type, selector, data, types[ type ], one ); - } - return elem; - } - - if ( data == null && fn == null ) { - - // ( types, fn ) - fn = selector; - data = selector = undefined; - } else if ( fn == null ) { - if ( typeof selector === "string" ) { - - // ( types, selector, fn ) - fn = data; - data = undefined; - } else { - - // ( types, data, fn ) - fn = data; - data = selector; - selector = undefined; - } - } - if ( fn === false ) { - fn = returnFalse; - } else if ( !fn ) { - return elem; - } - - if ( one === 1 ) { - origFn = fn; - fn = function( event ) { - - // Can use an empty set, since event contains the info - jQuery().off( event ); - return origFn.apply( this, arguments ); - }; - - // Use same guid so caller can remove using origFn - fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); - } - return elem.each( function() { - jQuery.event.add( this, types, fn, data, selector ); - } ); -} - -/* - * Helper functions for managing events -- not part of the public interface. - * Props to Dean Edwards' addEvent library for many of the ideas. - */ -jQuery.event = { - - global: {}, - - add: function( elem, types, handler, data, selector ) { - - var handleObjIn, eventHandle, tmp, - events, t, handleObj, - special, handlers, type, namespaces, origType, - elemData = dataPriv.get( elem ); - - // Don't attach events to noData or text/comment nodes (but allow plain objects) - if ( !elemData ) { - return; - } - - // Caller can pass in an object of custom data in lieu of the handler - if ( handler.handler ) { - handleObjIn = handler; - handler = handleObjIn.handler; - selector = handleObjIn.selector; - } - - // Make sure that the handler has a unique ID, used to find/remove it later - if ( !handler.guid ) { - handler.guid = jQuery.guid++; - } - - // Init the element's event structure and main handler, if this is the first - if ( !( events = elemData.events ) ) { - events = elemData.events = {}; - } - if ( !( eventHandle = elemData.handle ) ) { - eventHandle = elemData.handle = function( e ) { - - // Discard the second event of a jQuery.event.trigger() and - // when an event is called after a page has unloaded - return typeof jQuery !== "undefined" && jQuery.event.triggered !== e.type ? - jQuery.event.dispatch.apply( elem, arguments ) : undefined; - }; - } - - // Handle multiple events separated by a space - types = ( types || "" ).match( rnotwhite ) || [ "" ]; - t = types.length; - while ( t-- ) { - tmp = rtypenamespace.exec( types[ t ] ) || []; - type = origType = tmp[ 1 ]; - namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort(); - - // There *must* be a type, no attaching namespace-only handlers - if ( !type ) { - continue; - } - - // If event changes its type, use the special event handlers for the changed type - special = jQuery.event.special[ type ] || {}; - - // If selector defined, determine special event api type, otherwise given type - type = ( selector ? special.delegateType : special.bindType ) || type; - - // Update special based on newly reset type - special = jQuery.event.special[ type ] || {}; - - // handleObj is passed to all event handlers - handleObj = jQuery.extend( { - type: type, - origType: origType, - data: data, - handler: handler, - guid: handler.guid, - selector: selector, - needsContext: selector && jQuery.expr.match.needsContext.test( selector ), - namespace: namespaces.join( "." ) - }, handleObjIn ); - - // Init the event handler queue if we're the first - if ( !( handlers = events[ type ] ) ) { - handlers = events[ type ] = []; - handlers.delegateCount = 0; - - // Only use addEventListener if the special events handler returns false - if ( !special.setup || - special.setup.call( elem, data, namespaces, eventHandle ) === false ) { - - if ( elem.addEventListener ) { - elem.addEventListener( type, eventHandle ); - } - } - } - - if ( special.add ) { - special.add.call( elem, handleObj ); - - if ( !handleObj.handler.guid ) { - handleObj.handler.guid = handler.guid; - } - } - - // Add to the element's handler list, delegates in front - if ( selector ) { - handlers.splice( handlers.delegateCount++, 0, handleObj ); - } else { - handlers.push( handleObj ); - } - - // Keep track of which events have ever been used, for event optimization - jQuery.event.global[ type ] = true; - } - - }, - - // Detach an event or set of events from an element - remove: function( elem, types, handler, selector, mappedTypes ) { - - var j, origCount, tmp, - events, t, handleObj, - special, handlers, type, namespaces, origType, - elemData = dataPriv.hasData( elem ) && dataPriv.get( elem ); - - if ( !elemData || !( events = elemData.events ) ) { - return; - } - - // Once for each type.namespace in types; type may be omitted - types = ( types || "" ).match( rnotwhite ) || [ "" ]; - t = types.length; - while ( t-- ) { - tmp = rtypenamespace.exec( types[ t ] ) || []; - type = origType = tmp[ 1 ]; - namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort(); - - // Unbind all events (on this namespace, if provided) for the element - if ( !type ) { - for ( type in events ) { - jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); - } - continue; - } - - special = jQuery.event.special[ type ] || {}; - type = ( selector ? special.delegateType : special.bindType ) || type; - handlers = events[ type ] || []; - tmp = tmp[ 2 ] && - new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ); - - // Remove matching events - origCount = j = handlers.length; - while ( j-- ) { - handleObj = handlers[ j ]; - - if ( ( mappedTypes || origType === handleObj.origType ) && - ( !handler || handler.guid === handleObj.guid ) && - ( !tmp || tmp.test( handleObj.namespace ) ) && - ( !selector || selector === handleObj.selector || - selector === "**" && handleObj.selector ) ) { - handlers.splice( j, 1 ); - - if ( handleObj.selector ) { - handlers.delegateCount--; - } - if ( special.remove ) { - special.remove.call( elem, handleObj ); - } - } - } - - // Remove generic event handler if we removed something and no more handlers exist - // (avoids potential for endless recursion during removal of special event handlers) - if ( origCount && !handlers.length ) { - if ( !special.teardown || - special.teardown.call( elem, namespaces, elemData.handle ) === false ) { - - jQuery.removeEvent( elem, type, elemData.handle ); - } - - delete events[ type ]; - } - } - - // Remove data and the expando if it's no longer used - if ( jQuery.isEmptyObject( events ) ) { - dataPriv.remove( elem, "handle events" ); - } - }, - - dispatch: function( event ) { - - // Make a writable jQuery.Event from the native event object - event = jQuery.event.fix( event ); - - var i, j, ret, matched, handleObj, - handlerQueue = [], - args = slice.call( arguments ), - handlers = ( dataPriv.get( this, "events" ) || {} )[ event.type ] || [], - special = jQuery.event.special[ event.type ] || {}; - - // Use the fix-ed jQuery.Event rather than the (read-only) native event - args[ 0 ] = event; - event.delegateTarget = this; - - // Call the preDispatch hook for the mapped type, and let it bail if desired - if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) { - return; - } - - // Determine handlers - handlerQueue = jQuery.event.handlers.call( this, event, handlers ); - - // Run delegates first; they may want to stop propagation beneath us - i = 0; - while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) { - event.currentTarget = matched.elem; - - j = 0; - while ( ( handleObj = matched.handlers[ j++ ] ) && - !event.isImmediatePropagationStopped() ) { - - // Triggered event must either 1) have no namespace, or 2) have namespace(s) - // a subset or equal to those in the bound event (both can have no namespace). - if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) { - - event.handleObj = handleObj; - event.data = handleObj.data; - - ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle || - handleObj.handler ).apply( matched.elem, args ); - - if ( ret !== undefined ) { - if ( ( event.result = ret ) === false ) { - event.preventDefault(); - event.stopPropagation(); - } - } - } - } - } - - // Call the postDispatch hook for the mapped type - if ( special.postDispatch ) { - special.postDispatch.call( this, event ); - } - - return event.result; - }, - - handlers: function( event, handlers ) { - var i, matches, sel, handleObj, - handlerQueue = [], - delegateCount = handlers.delegateCount, - cur = event.target; - - // Support (at least): Chrome, IE9 - // Find delegate handlers - // Black-hole SVG instance trees (#13180) - // - // Support: Firefox<=42+ - // Avoid non-left-click in FF but don't block IE radio events (#3861, gh-2343) - if ( delegateCount && cur.nodeType && - ( event.type !== "click" || isNaN( event.button ) || event.button < 1 ) ) { - - for ( ; cur !== this; cur = cur.parentNode || this ) { - - // Don't check non-elements (#13208) - // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) - if ( cur.nodeType === 1 && ( cur.disabled !== true || event.type !== "click" ) ) { - matches = []; - for ( i = 0; i < delegateCount; i++ ) { - handleObj = handlers[ i ]; - - // Don't conflict with Object.prototype properties (#13203) - sel = handleObj.selector + " "; - - if ( matches[ sel ] === undefined ) { - matches[ sel ] = handleObj.needsContext ? - jQuery( sel, this ).index( cur ) > -1 : - jQuery.find( sel, this, null, [ cur ] ).length; - } - if ( matches[ sel ] ) { - matches.push( handleObj ); - } - } - if ( matches.length ) { - handlerQueue.push( { elem: cur, handlers: matches } ); - } - } - } - } - - // Add the remaining (directly-bound) handlers - if ( delegateCount < handlers.length ) { - handlerQueue.push( { elem: this, handlers: handlers.slice( delegateCount ) } ); - } - - return handlerQueue; - }, - - // Includes some event props shared by KeyEvent and MouseEvent - props: ( "altKey bubbles cancelable ctrlKey currentTarget detail eventPhase " + - "metaKey relatedTarget shiftKey target timeStamp view which" ).split( " " ), - - fixHooks: {}, - - keyHooks: { - props: "char charCode key keyCode".split( " " ), - filter: function( event, original ) { - - // Add which for key events - if ( event.which == null ) { - event.which = original.charCode != null ? original.charCode : original.keyCode; - } - - return event; - } - }, - - mouseHooks: { - props: ( "button buttons clientX clientY offsetX offsetY pageX pageY " + - "screenX screenY toElement" ).split( " " ), - filter: function( event, original ) { - var eventDoc, doc, body, - button = original.button; - - // Calculate pageX/Y if missing and clientX/Y available - if ( event.pageX == null && original.clientX != null ) { - eventDoc = event.target.ownerDocument || document; - doc = eventDoc.documentElement; - body = eventDoc.body; - - event.pageX = original.clientX + - ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - - ( doc && doc.clientLeft || body && body.clientLeft || 0 ); - event.pageY = original.clientY + - ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - - ( doc && doc.clientTop || body && body.clientTop || 0 ); - } - - // Add which for click: 1 === left; 2 === middle; 3 === right - // Note: button is not normalized, so don't use it - if ( !event.which && button !== undefined ) { - event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); - } - - return event; - } - }, - - fix: function( event ) { - if ( event[ jQuery.expando ] ) { - return event; - } - - // Create a writable copy of the event object and normalize some properties - var i, prop, copy, - type = event.type, - originalEvent = event, - fixHook = this.fixHooks[ type ]; - - if ( !fixHook ) { - this.fixHooks[ type ] = fixHook = - rmouseEvent.test( type ) ? this.mouseHooks : - rkeyEvent.test( type ) ? this.keyHooks : - {}; - } - copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; - - event = new jQuery.Event( originalEvent ); - - i = copy.length; - while ( i-- ) { - prop = copy[ i ]; - event[ prop ] = originalEvent[ prop ]; - } - - // Support: Cordova 2.5 (WebKit) (#13255) - // All events should have a target; Cordova deviceready doesn't - if ( !event.target ) { - event.target = document; - } - - // Support: Safari 6.0+, Chrome<28 - // Target should not be a text node (#504, #13143) - if ( event.target.nodeType === 3 ) { - event.target = event.target.parentNode; - } - - return fixHook.filter ? fixHook.filter( event, originalEvent ) : event; - }, - - special: { - load: { - - // Prevent triggered image.load events from bubbling to window.load - noBubble: true - }, - focus: { - - // Fire native event if possible so blur/focus sequence is correct - trigger: function() { - if ( this !== safeActiveElement() && this.focus ) { - this.focus(); - return false; - } - }, - delegateType: "focusin" - }, - blur: { - trigger: function() { - if ( this === safeActiveElement() && this.blur ) { - this.blur(); - return false; - } - }, - delegateType: "focusout" - }, - click: { - - // For checkbox, fire native event so checked state will be right - trigger: function() { - if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) { - this.click(); - return false; - } - }, - - // For cross-browser consistency, don't fire native .click() on links - _default: function( event ) { - return jQuery.nodeName( event.target, "a" ); - } - }, - - beforeunload: { - postDispatch: function( event ) { - - // Support: Firefox 20+ - // Firefox doesn't alert if the returnValue field is not set. - if ( event.result !== undefined && event.originalEvent ) { - event.originalEvent.returnValue = event.result; - } - } - } - } -}; - -jQuery.removeEvent = function( elem, type, handle ) { - - // This "if" is needed for plain objects - if ( elem.removeEventListener ) { - elem.removeEventListener( type, handle ); - } -}; - -jQuery.Event = function( src, props ) { - - // Allow instantiation without the 'new' keyword - if ( !( this instanceof jQuery.Event ) ) { - return new jQuery.Event( src, props ); - } - - // Event object - if ( src && src.type ) { - this.originalEvent = src; - this.type = src.type; - - // Events bubbling up the document may have been marked as prevented - // by a handler lower down the tree; reflect the correct value. - this.isDefaultPrevented = src.defaultPrevented || - src.defaultPrevented === undefined && - - // Support: Android<4.0 - src.returnValue === false ? - returnTrue : - returnFalse; - - // Event type - } else { - this.type = src; - } - - // Put explicitly provided properties onto the event object - if ( props ) { - jQuery.extend( this, props ); - } - - // Create a timestamp if incoming event doesn't have one - this.timeStamp = src && src.timeStamp || jQuery.now(); - - // Mark it as fixed - this[ jQuery.expando ] = true; -}; - -// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding -// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html -jQuery.Event.prototype = { - constructor: jQuery.Event, - isDefaultPrevented: returnFalse, - isPropagationStopped: returnFalse, - isImmediatePropagationStopped: returnFalse, - isSimulated: false, - - preventDefault: function() { - var e = this.originalEvent; - - this.isDefaultPrevented = returnTrue; - - if ( e && !this.isSimulated ) { - e.preventDefault(); - } - }, - stopPropagation: function() { - var e = this.originalEvent; - - this.isPropagationStopped = returnTrue; - - if ( e && !this.isSimulated ) { - e.stopPropagation(); - } - }, - stopImmediatePropagation: function() { - var e = this.originalEvent; - - this.isImmediatePropagationStopped = returnTrue; - - if ( e && !this.isSimulated ) { - e.stopImmediatePropagation(); - } - - this.stopPropagation(); - } -}; - -// Create mouseenter/leave events using mouseover/out and event-time checks -// so that event delegation works in jQuery. -// Do the same for pointerenter/pointerleave and pointerover/pointerout -// -// Support: Safari 7 only -// Safari sends mouseenter too often; see: -// https://code.google.com/p/chromium/issues/detail?id=470258 -// for the description of the bug (it existed in older Chrome versions as well). -jQuery.each( { - mouseenter: "mouseover", - mouseleave: "mouseout", - pointerenter: "pointerover", - pointerleave: "pointerout" -}, function( orig, fix ) { - jQuery.event.special[ orig ] = { - delegateType: fix, - bindType: fix, - - handle: function( event ) { - var ret, - target = this, - related = event.relatedTarget, - handleObj = event.handleObj; - - // For mouseenter/leave call the handler if related is outside the target. - // NB: No relatedTarget if the mouse left/entered the browser window - if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) { - event.type = handleObj.origType; - ret = handleObj.handler.apply( this, arguments ); - event.type = fix; - } - return ret; - } - }; -} ); - -jQuery.fn.extend( { - on: function( types, selector, data, fn ) { - return on( this, types, selector, data, fn ); - }, - one: function( types, selector, data, fn ) { - return on( this, types, selector, data, fn, 1 ); - }, - off: function( types, selector, fn ) { - var handleObj, type; - if ( types && types.preventDefault && types.handleObj ) { - - // ( event ) dispatched jQuery.Event - handleObj = types.handleObj; - jQuery( types.delegateTarget ).off( - handleObj.namespace ? - handleObj.origType + "." + handleObj.namespace : - handleObj.origType, - handleObj.selector, - handleObj.handler - ); - return this; - } - if ( typeof types === "object" ) { - - // ( types-object [, selector] ) - for ( type in types ) { - this.off( type, selector, types[ type ] ); - } - return this; - } - if ( selector === false || typeof selector === "function" ) { - - // ( types [, fn] ) - fn = selector; - selector = undefined; - } - if ( fn === false ) { - fn = returnFalse; - } - return this.each( function() { - jQuery.event.remove( this, types, fn, selector ); - } ); - } -} ); - - -var - rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi, - - // Support: IE 10-11, Edge 10240+ - // In IE/Edge using regex groups here causes severe slowdowns. - // See https://connect.microsoft.com/IE/feedback/details/1736512/ - rnoInnerhtml = /\s*$/g; - -// Manipulating tables requires a tbody -function manipulationTarget( elem, content ) { - return jQuery.nodeName( elem, "table" ) && - jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ? - - elem.getElementsByTagName( "tbody" )[ 0 ] || - elem.appendChild( elem.ownerDocument.createElement( "tbody" ) ) : - elem; -} - -// Replace/restore the type attribute of script elements for safe DOM manipulation -function disableScript( elem ) { - elem.type = ( elem.getAttribute( "type" ) !== null ) + "/" + elem.type; - return elem; -} -function restoreScript( elem ) { - var match = rscriptTypeMasked.exec( elem.type ); - - if ( match ) { - elem.type = match[ 1 ]; - } else { - elem.removeAttribute( "type" ); - } - - return elem; -} - -function cloneCopyEvent( src, dest ) { - var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events; - - if ( dest.nodeType !== 1 ) { - return; - } - - // 1. Copy private data: events, handlers, etc. - if ( dataPriv.hasData( src ) ) { - pdataOld = dataPriv.access( src ); - pdataCur = dataPriv.set( dest, pdataOld ); - events = pdataOld.events; - - if ( events ) { - delete pdataCur.handle; - pdataCur.events = {}; - - for ( type in events ) { - for ( i = 0, l = events[ type ].length; i < l; i++ ) { - jQuery.event.add( dest, type, events[ type ][ i ] ); - } - } - } - } - - // 2. Copy user data - if ( dataUser.hasData( src ) ) { - udataOld = dataUser.access( src ); - udataCur = jQuery.extend( {}, udataOld ); - - dataUser.set( dest, udataCur ); - } -} - -// Fix IE bugs, see support tests -function fixInput( src, dest ) { - var nodeName = dest.nodeName.toLowerCase(); - - // Fails to persist the checked state of a cloned checkbox or radio button. - if ( nodeName === "input" && rcheckableType.test( src.type ) ) { - dest.checked = src.checked; - - // Fails to return the selected option to the default selected state when cloning options - } else if ( nodeName === "input" || nodeName === "textarea" ) { - dest.defaultValue = src.defaultValue; - } -} - -function domManip( collection, args, callback, ignored ) { - - // Flatten any nested arrays - args = concat.apply( [], args ); - - var fragment, first, scripts, hasScripts, node, doc, - i = 0, - l = collection.length, - iNoClone = l - 1, - value = args[ 0 ], - isFunction = jQuery.isFunction( value ); - - // We can't cloneNode fragments that contain checked, in WebKit - if ( isFunction || - ( l > 1 && typeof value === "string" && - !support.checkClone && rchecked.test( value ) ) ) { - return collection.each( function( index ) { - var self = collection.eq( index ); - if ( isFunction ) { - args[ 0 ] = value.call( this, index, self.html() ); - } - domManip( self, args, callback, ignored ); - } ); - } - - if ( l ) { - fragment = buildFragment( args, collection[ 0 ].ownerDocument, false, collection, ignored ); - first = fragment.firstChild; - - if ( fragment.childNodes.length === 1 ) { - fragment = first; - } - - // Require either new content or an interest in ignored elements to invoke the callback - if ( first || ignored ) { - scripts = jQuery.map( getAll( fragment, "script" ), disableScript ); - hasScripts = scripts.length; - - // Use the original fragment for the last item - // instead of the first because it can end up - // being emptied incorrectly in certain situations (#8070). - for ( ; i < l; i++ ) { - node = fragment; - - if ( i !== iNoClone ) { - node = jQuery.clone( node, true, true ); - - // Keep references to cloned scripts for later restoration - if ( hasScripts ) { - - // Support: Android<4.1, PhantomJS<2 - // push.apply(_, arraylike) throws on ancient WebKit - jQuery.merge( scripts, getAll( node, "script" ) ); - } - } - - callback.call( collection[ i ], node, i ); - } - - if ( hasScripts ) { - doc = scripts[ scripts.length - 1 ].ownerDocument; - - // Reenable scripts - jQuery.map( scripts, restoreScript ); - - // Evaluate executable scripts on first document insertion - for ( i = 0; i < hasScripts; i++ ) { - node = scripts[ i ]; - if ( rscriptType.test( node.type || "" ) && - !dataPriv.access( node, "globalEval" ) && - jQuery.contains( doc, node ) ) { - - if ( node.src ) { - - // Optional AJAX dependency, but won't run scripts if not present - if ( jQuery._evalUrl ) { - jQuery._evalUrl( node.src ); - } - } else { - jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) ); - } - } - } - } - } - } - - return collection; -} - -function remove( elem, selector, keepData ) { - var node, - nodes = selector ? jQuery.filter( selector, elem ) : elem, - i = 0; - - for ( ; ( node = nodes[ i ] ) != null; i++ ) { - if ( !keepData && node.nodeType === 1 ) { - jQuery.cleanData( getAll( node ) ); - } - - if ( node.parentNode ) { - if ( keepData && jQuery.contains( node.ownerDocument, node ) ) { - setGlobalEval( getAll( node, "script" ) ); - } - node.parentNode.removeChild( node ); - } - } - - return elem; -} - -jQuery.extend( { - htmlPrefilter: function( html ) { - return html.replace( rxhtmlTag, "<$1>" ); - }, - - clone: function( elem, dataAndEvents, deepDataAndEvents ) { - var i, l, srcElements, destElements, - clone = elem.cloneNode( true ), - inPage = jQuery.contains( elem.ownerDocument, elem ); - - // Fix IE cloning issues - if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) && - !jQuery.isXMLDoc( elem ) ) { - - // We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2 - destElements = getAll( clone ); - srcElements = getAll( elem ); - - for ( i = 0, l = srcElements.length; i < l; i++ ) { - fixInput( srcElements[ i ], destElements[ i ] ); - } - } - - // Copy the events from the original to the clone - if ( dataAndEvents ) { - if ( deepDataAndEvents ) { - srcElements = srcElements || getAll( elem ); - destElements = destElements || getAll( clone ); - - for ( i = 0, l = srcElements.length; i < l; i++ ) { - cloneCopyEvent( srcElements[ i ], destElements[ i ] ); - } - } else { - cloneCopyEvent( elem, clone ); - } - } - - // Preserve script evaluation history - destElements = getAll( clone, "script" ); - if ( destElements.length > 0 ) { - setGlobalEval( destElements, !inPage && getAll( elem, "script" ) ); - } - - // Return the cloned set - return clone; - }, - - cleanData: function( elems ) { - var data, elem, type, - special = jQuery.event.special, - i = 0; - - for ( ; ( elem = elems[ i ] ) !== undefined; i++ ) { - if ( acceptData( elem ) ) { - if ( ( data = elem[ dataPriv.expando ] ) ) { - if ( data.events ) { - for ( type in data.events ) { - if ( special[ type ] ) { - jQuery.event.remove( elem, type ); - - // This is a shortcut to avoid jQuery.event.remove's overhead - } else { - jQuery.removeEvent( elem, type, data.handle ); - } - } - } - - // Support: Chrome <= 35-45+ - // Assign undefined instead of using delete, see Data#remove - elem[ dataPriv.expando ] = undefined; - } - if ( elem[ dataUser.expando ] ) { - - // Support: Chrome <= 35-45+ - // Assign undefined instead of using delete, see Data#remove - elem[ dataUser.expando ] = undefined; - } - } - } - } -} ); - -jQuery.fn.extend( { - - // Keep domManip exposed until 3.0 (gh-2225) - domManip: domManip, - - detach: function( selector ) { - return remove( this, selector, true ); - }, - - remove: function( selector ) { - return remove( this, selector ); - }, - - text: function( value ) { - return access( this, function( value ) { - return value === undefined ? - jQuery.text( this ) : - this.empty().each( function() { - if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { - this.textContent = value; - } - } ); - }, null, value, arguments.length ); - }, - - append: function() { - return domManip( this, arguments, function( elem ) { - if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { - var target = manipulationTarget( this, elem ); - target.appendChild( elem ); - } - } ); - }, - - prepend: function() { - return domManip( this, arguments, function( elem ) { - if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { - var target = manipulationTarget( this, elem ); - target.insertBefore( elem, target.firstChild ); - } - } ); - }, - - before: function() { - return domManip( this, arguments, function( elem ) { - if ( this.parentNode ) { - this.parentNode.insertBefore( elem, this ); - } - } ); - }, - - after: function() { - return domManip( this, arguments, function( elem ) { - if ( this.parentNode ) { - this.parentNode.insertBefore( elem, this.nextSibling ); - } - } ); - }, - - empty: function() { - var elem, - i = 0; - - for ( ; ( elem = this[ i ] ) != null; i++ ) { - if ( elem.nodeType === 1 ) { - - // Prevent memory leaks - jQuery.cleanData( getAll( elem, false ) ); - - // Remove any remaining nodes - elem.textContent = ""; - } - } - - return this; - }, - - clone: function( dataAndEvents, deepDataAndEvents ) { - dataAndEvents = dataAndEvents == null ? false : dataAndEvents; - deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents; - - return this.map( function() { - return jQuery.clone( this, dataAndEvents, deepDataAndEvents ); - } ); - }, - - html: function( value ) { - return access( this, function( value ) { - var elem = this[ 0 ] || {}, - i = 0, - l = this.length; - - if ( value === undefined && elem.nodeType === 1 ) { - return elem.innerHTML; - } - - // See if we can take a shortcut and just use innerHTML - if ( typeof value === "string" && !rnoInnerhtml.test( value ) && - !wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) { - - value = jQuery.htmlPrefilter( value ); - - try { - for ( ; i < l; i++ ) { - elem = this[ i ] || {}; - - // Remove element nodes and prevent memory leaks - if ( elem.nodeType === 1 ) { - jQuery.cleanData( getAll( elem, false ) ); - elem.innerHTML = value; - } - } - - elem = 0; - - // If using innerHTML throws an exception, use the fallback method - } catch ( e ) {} - } - - if ( elem ) { - this.empty().append( value ); - } - }, null, value, arguments.length ); - }, - - replaceWith: function() { - var ignored = []; - - // Make the changes, replacing each non-ignored context element with the new content - return domManip( this, arguments, function( elem ) { - var parent = this.parentNode; - - if ( jQuery.inArray( this, ignored ) < 0 ) { - jQuery.cleanData( getAll( this ) ); - if ( parent ) { - parent.replaceChild( elem, this ); - } - } - - // Force callback invocation - }, ignored ); - } -} ); - -jQuery.each( { - appendTo: "append", - prependTo: "prepend", - insertBefore: "before", - insertAfter: "after", - replaceAll: "replaceWith" -}, function( name, original ) { - jQuery.fn[ name ] = function( selector ) { - var elems, - ret = [], - insert = jQuery( selector ), - last = insert.length - 1, - i = 0; - - for ( ; i <= last; i++ ) { - elems = i === last ? this : this.clone( true ); - jQuery( insert[ i ] )[ original ]( elems ); - - // Support: QtWebKit - // .get() because push.apply(_, arraylike) throws - push.apply( ret, elems.get() ); - } - - return this.pushStack( ret ); - }; -} ); - - -var iframe, - elemdisplay = { - - // Support: Firefox - // We have to pre-define these values for FF (#10227) - HTML: "block", - BODY: "block" - }; - -/** - * Retrieve the actual display of a element - * @param {String} name nodeName of the element - * @param {Object} doc Document object - */ - -// Called only from within defaultDisplay -function actualDisplay( name, doc ) { - var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ), - - display = jQuery.css( elem[ 0 ], "display" ); - - // We don't have any data stored on the element, - // so use "detach" method as fast way to get rid of the element - elem.detach(); - - return display; -} - -/** - * Try to determine the default display value of an element - * @param {String} nodeName - */ -function defaultDisplay( nodeName ) { - var doc = document, - display = elemdisplay[ nodeName ]; - - if ( !display ) { - display = actualDisplay( nodeName, doc ); - - // If the simple way fails, read from inside an iframe - if ( display === "none" || !display ) { - - // Use the already-created iframe if possible - iframe = ( iframe || jQuery( "