orthanc: OrthancExplorer/explorer.js comparison

comparison OrthancExplorer/explorer.js @ 3066:5713952f60c0 update-jquery

upgraded jquery, jquery-mobile, jquery-file-upload. Everything seems to be working as before. Theme has changed !

author	am@osimis.io
date	Wed, 26 Dec 2018 16:58:21 +0100
parents	b89a4288d605
children

comparison

equal deleted inserted replaced

-:b89a4288d605
+:5713952f60c0
 // http://stackoverflow.com/questions/1663741/is-there-a-good-jquery-drag-and-drop-file-upload-plugin
-// Forbid the access to IE
+//detect browser (from https://stackoverflow.com/questions/5916900/how-can-you-detect-the-version-of-a-browser)
-if ($.browser.msie)
+navigator.browserSpecs = (function(){
-{
+var ua = navigator.userAgent, tem,
-alert("Please use Mozilla Firefox or Google Chrome. Microsoft Internet Explorer is not supported.");
+M = ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || [];
+if(/trident/i.test(M[1])){
+tem = /\brv[ :]+(\d+)/g.exec(ua) || [];
+return {name:'IE',version:(tem[1] || '')};
+}
+if(M[1]=== 'Chrome'){
+tem = ua.match(/\b(OPR|Edge)\/(\d+)/);
+if(tem != null) return {name:tem[1].replace('OPR', 'Opera'),version:tem[2]};
+}
+M = M[2]? [M[1], M[2]]: [navigator.appName, navigator.appVersion, '-?'];
+if((tem = ua.match(/version\/(\d+)/i))!= null)
+M.splice(1, 1, tem[1]);
+return {name:M[0], version:M[1]};
+})();
+if (navigator.browserSpecs.name == 'IE' && navigator.browserSpecs.version < 11) {
+alert("Your version of Internet Explorer is not supported.  Please use Mozilla Firefox or Google Chrome.");
 }
 // http://jquerymobile.com/demos/1.1.0/docs/api/globalconfig.html
 //$.mobile.ajaxEnabled = false;
 //$.mobile.page.prototype.options.addBackBtn = true;
 else
 $tree.tree('openNode', event.node, true);
 }
 );
-currentPage = $.mobile.pageData.active;
+if (!(typeof $.mobile.pageData === 'undefined')) {
-currentUuid = $.mobile.pageData.uuid;
-if (!(typeof currentPage === 'undefined') &&
+currentPage = $.mobile.pageData.active;
-!(typeof currentUuid === 'undefined') &&
+currentUuid = $.mobile.pageData.uuid;
-currentPage.length > 0 &&
+if (!(typeof currentPage === 'undefined') &&
-currentUuid.length > 0)
+!(typeof currentUuid === 'undefined') &&
-{
+currentPage.length > 0 &&
-Refresh();
+currentUuid.length > 0)
+{
+Refresh();
+}
 }
 });
 function SplitLongUid(s)
 return CompleteFormatting(node, link, isReverse);
 }
-$('[data-role="page"]').live('pagebeforeshow', function() {
+$(document).on("pagebeforeshow", '[data-role="page"]', function() {
 $.ajax({
 url: '../system',
 dataType: 'json',
 async: false,
 cache: false,
 });
 });
-$('#lookup').live('pagebeforeshow', function() {
+$(document).on("pagebeforeshow", "#lookup", function() {
 // NB: "GenerateDicomDate()" is defined in "query-retrieve.js"
 let target = $('#lookup-study-date');
 $('option', target).remove();
 target.append($('<option>').attr('value', '*').text('Any date'));
 target.append($('<option>').attr('value', GenerateDicomDate(0)).text('Today'));
 $('#lookup-result').hide();
 });
-$('#lookup-submit').live('click', function() {
+$(document).on("click", "#lookup-submit", function(e) {
 $('#lookup-result').hide();
 let lookup = {
 'Level' : 'Study',
 'Expand' : true,
 return false;
 });
-$('#find-patients').live('pagebeforeshow', function() {
+$(document).on("pagebeforeshow", "#find-patients", function() {
 GetResource('/patients?expand&since=0&limit=' + (LIMIT_RESOURCES + 1), function(patients) {
 let target = $('#all-patients');
 $('li', target).remove();
 SortOnDicomTag(patients, 'PatientName', false, false);
 } else {
 $(alertId).hide();
 }
 }
+$(document).on("pagebeforeshow", "#find-studies", function() {
-$('#find-studies').live('pagebeforeshow', function() {
 GetResource('/studies?expand&since=0&limit=' + (LIMIT_RESOURCES + 1), function(studies) {
 FormatListOfStudies('#all-studies', '#alert-studies', '#count-studies', studies);
 });
 });
 });
 });
 }
 }
-$(document).live('pagebeforehide', function() {
+$(document).on('pagebeforehide', function() {
 currentPage = '';
 currentUuid = '';
 });
-$('#patient').live('pagebeforeshow', RefreshPatient);
+$(document).on("pagebeforeshow", "#patient", RefreshPatient);
-$('#study').live('pagebeforeshow', RefreshStudy);
+$(document).on("pagebeforeshow", "#study", RefreshStudy);
-$('#series').live('pagebeforeshow', RefreshSeries);
+$(document).on("pagebeforeshow", "#series", RefreshSeries);
-$('#instance').live('pagebeforeshow', RefreshInstance);
+$(document).on("pagebeforeshow", "#instance", RefreshInstance);
 $(function() {
 $(window).hashchange(function(e, data) {
 // This fixes the navigation with the back button and with the anonymization
 if ('uuid' in $.mobile.pageData &&
 });
 }
-$('#instance-delete').live('click', function() {
+$(document).on("click", "#instance-delete", function() {
 OpenDeleteResourceDialog('../instances/' + $.mobile.pageData.uuid,
 'Delete this instance?');
 });
-$('#study-delete').live('click', function() {
+$(document).on("click", "#study-delete", function(e) {
 OpenDeleteResourceDialog('../studies/' + $.mobile.pageData.uuid,
 'Delete this study?');
 });
-$('#series-delete').live('click', function() {
+$(document).on("click", "#series-delete", function(e) {
 OpenDeleteResourceDialog('../series/' + $.mobile.pageData.uuid,
 'Delete this series?');
 });
-$('#patient-delete').live('click', function() {
+$(document).on("click", "#patient-delete", function(e) {
 OpenDeleteResourceDialog('../patients/' + $.mobile.pageData.uuid,
 'Delete this patient?');
 });
-$('#instance-download-dicom').live('click', function(e) {
+$(document).on("click", "#instance-download-dicom", function(e) {
 // http://stackoverflow.com/a/1296101
 e.preventDefault();  //stop the browser from following
 window.location.href = '../instances/' + $.mobile.pageData.uuid + '/file';
 });
-$('#instance-download-json').live('click', function(e) {
+$(document).on("click", "#instance-download-json", function(e) {
 // http://stackoverflow.com/a/1296101
 e.preventDefault();  //stop the browser from following
 window.location.href = '../instances/' + $.mobile.pageData.uuid + '/tags';
 });
-$('#instance-preview').live('click', function(e) {
+$(document).on("click", "#instance-preview", function(e) {
 if ($.mobile.pageData) {
 let pageData = DeepCopy($.mobile.pageData);
 let pdf = '../instances/' + pageData.uuid + '/pdf';
 $.ajax({
 }
 });
-$('#series-preview').live('click', function(e) {
+$(document).on("click", "#series-preview", function(e) {
 if ($.mobile.pageData) {
 let pageData = DeepCopy($.mobile.pageData);
 GetResource('/series/' + pageData.uuid, function(series) {
 GetResource('/series/' + pageData.uuid + '/instances', function(instances) {
 }
 });
 }
-$('#instance-store,#series-store,#study-store,#patient-store').live('click', function(e) {
+$(document).on("click", "#instance-store,#series-store,#study-store,#patient-store", function(e) {
 ChooseDicomModality(function(modality, peer) {
 let pageData = DeepCopy($.mobile.pageData);
 let url;
 let loading;
 }
 });
 });
-$('#show-tag-name').live('change', function(e) {
+$(document).on("change", "#show-tag-name", function(e) {
 let checked = e.currentTarget.checked;
 if (checked)
 $('.tag-name').show();
 else
 $('.tag-name').hide();
 });
-$('#patient-archive').live('click', function(e) {
+$(document).on("click", "#patient-archive", function(e) {
 e.preventDefault();  //stop the browser from following
 window.location.href = '../patients/' + $.mobile.pageData.uuid + '/archive';
 });
-$('#study-archive').live('click', function(e) {
+$(document).on("click", "#study-archive", function(e) {
 e.preventDefault();  //stop the browser from following
 window.location.href = '../studies/' + $.mobile.pageData.uuid + '/archive';
 });
-$('#series-archive').live('click', function(e) {
+$(document).on("click", "#series-archive", function(e) {
 e.preventDefault();  //stop the browser from following
 window.location.href = '../series/' + $.mobile.pageData.uuid + '/archive';
 });
-$('#patient-media').live('click', function(e) {
+$(document).on("click", "#patient-media", function(e) {
 e.preventDefault();  //stop the browser from following
 window.location.href = '../patients/' + $.mobile.pageData.uuid + '/media';
 });
-$('#study-media').live('click', function(e) {
+$(document).on("click", "#study-media", function(e) {
 e.preventDefault();  //stop the browser from following
 window.location.href = '../studies/' + $.mobile.pageData.uuid + '/media';
 });
-$('#series-media').live('click', function(e) {
+$(document).on("click", "#series-media", function(e) {
 e.preventDefault();  //stop the browser from following
 window.location.href = '../series/' + $.mobile.pageData.uuid + '/media';
 });
-$('#protection').live('change', function(e) {
+$(document).on("change", "#protection", function(e) {
 let isProtected = e.target.value == "on";
 $.ajax({
 url: '../patients/' + $.mobile.pageData.uuid + '/protected',
 type: 'PUT',
 dataType: 'text',
 }
 }
 });
 }
-$('#instance-anonymize').live('click', function() {
+$(document).on("click", "#instance-anonymize", function(e) {
 OpenAnonymizeResourceDialog('../instances/' + $.mobile.pageData.uuid,
 'Anonymize this instance?');
 });
-$('#study-anonymize').live('click', function() {
+$(document).on("click", "#study-anonymize", function(e) {
 OpenAnonymizeResourceDialog('../studies/' + $.mobile.pageData.uuid,
 'Anonymize this study?');
 });
-$('#series-anonymize').live('click', function() {
+$(document).on("click", "#series-anonymize", function(e) {
 OpenAnonymizeResourceDialog('../series/' + $.mobile.pageData.uuid,
 'Anonymize this series?');
 });
-$('#patient-anonymize').live('click', function() {
+$(document).on("click", "#patient-anonymize", function(e) {
 OpenAnonymizeResourceDialog('../patients/' + $.mobile.pageData.uuid,
 'Anonymize this patient?');
 });
-$('#plugins').live('pagebeforeshow', function() {
+$(document).on("pagebeforeshow", "#plugins", function() {
 $.ajax({
 url: '../plugins',
 dataType: 'json',
 async: false,
 cache: false,
 .append($('<strong>').text(ParseJobTime(field))));
 }
 }
-$('#jobs').live('pagebeforeshow', function() {
+$(document).on("pagebeforeshow", "#jobs", function() {
 $.ajax({
 url: '../jobs?expand',
 dataType: 'json',
 async: false,
 cache: false,
 }
 });
 });
-$('#job').live('pagebeforeshow', function() {
+$(document).on("pagebeforeshow", "#job", function() {
 if ($.mobile.pageData) {
 let pageData = DeepCopy($.mobile.pageData);
 $.ajax({
 url: '../jobs/' + pageData.uuid,
 window.location.reload();
 }
 });
 }
-$('#job-cancel').live('click', function() {
+$(document).on("click", "#job-cancel", function(e) {
 TriggerJobAction('cancel');
 });
-$('#job-resubmit').live('click', function() {
+$(document).on("click", "#job-resubmit", function(e) {
 TriggerJobAction('resubmit');
 });
-$('#job-pause').live('click', function() {
+$(document).on("click", "#job-pause", function(e) {
 TriggerJobAction('pause');
 });
-$('#job-resume').live('click', function() {
+$(document).on("click", "#job-resume", function(e) {
 TriggerJobAction('resume');
 });