X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=js%2FCommon.js;h=c2134fa8023c70e7a2767e77d91ddac82819d7b9;hb=972bd8974a95be4fc46957a7f748e5beab1583dc;hp=4dd1a05783507bb860dd0817979eca6d19b5aad6;hpb=3ceb87f805c70e3f0ed4167e2d2587e8fa1f4453;p=civicrm-core.git
diff --git a/js/Common.js b/js/Common.js
index 4dd1a05783..c2134fa802 100644
--- a/js/Common.js
+++ b/js/Common.js
@@ -201,8 +201,9 @@ function showHideRow(index) {
/* jshint ignore:end */
-CRM.utils = CRM.utils || {};
-CRM.strings = CRM.strings || {};
+if (!CRM.utils) CRM.utils = {};
+if (!CRM.strings) CRM.strings = {};
+if (!CRM.vars) CRM.vars = {};
(function ($, _, undefined) {
"use strict";
@@ -590,6 +591,9 @@ CRM.strings = CRM.strings || {};
});
}
+ /**
+ * @see http://wiki.civicrm.org/confluence/display/CRMDOC/crmDatepicker
+ */
$.fn.crmDatepicker = function(options) {
return $(this).each(function() {
if ($(this).is('.crm-form-date-wrapper .crm-hidden-date')) {
@@ -603,8 +607,8 @@ CRM.strings = CRM.strings || {};
$timeField = $(),
$clearLink = $();
- if (settings.allowClear !== undefined ? settings.allowClear : !$dataField.hasClass('required')) {
- $clearLink = $('')
+ if (settings.allowClear !== undefined ? settings.allowClear : !$dataField.is('.required, [required]')) {
+ $clearLink = $('')
.insertAfter($dataField);
}
if (settings.time !== false) {
@@ -623,15 +627,15 @@ CRM.strings = CRM.strings || {};
$dateField = $('').insertAfter($dataField);
copyAttributes($dataField, $dateField, ['placeholder', 'style', 'class', 'disabled']);
$dateField.addClass('crm-form-text crm-form-date');
- settings.dateFormat = settings.dateFormat || CRM.config.dateInputFormat;
- settings.changeMonth = _.includes('m', settings.dateFormat);
- settings.changeYear = _.includes('y', settings.dateFormat);
+ settings.date = typeof settings.date === 'string' ? settings.date : CRM.config.dateInputFormat;
+ settings.changeMonth = _.includes('m', settings.date);
+ settings.changeYear = _.includes('y', settings.date);
$dateField.datepicker(settings).change(updateDataField);
}
// Rudimentary validation. TODO: Roll into use of jQUery validate and ui.datepicker.validation
function isValidDate() {
try {
- $.datepicker.parseDate(settings.dateFormat, $dateField.val());
+ $.datepicker.parseDate(settings.date, $dateField.val());
return true;
} catch (e) {
return false;
@@ -678,6 +682,38 @@ CRM.strings = CRM.strings || {};
});
};
+ $.fn.crmAjaxTable = function() {
+ return $(this).each(function() {
+ //Declare the defaults for DataTables
+ var defaults = {
+ "processing": true,
+ "serverSide": true,
+ "dom": '<"crm-datatable-pager-top"lfp>rt<"crm-datatable-pager-bottom"ip>',
+ "pageLength": 25,
+ "drawCallback": function(settings) {
+ //Add data attributes to cells
+ $('thead th', settings.nTable).each( function( index ) {
+ $.each(this.attributes, function() {
+ if(this.name.match("^cell-")) {
+ var cellAttr = this.name.substring(5);
+ var cellValue = this.value;
+ $('tbody tr', settings.nTable).each( function() {
+ $('td:eq('+ index +')', this).attr( cellAttr, cellValue );
+ });
+ }
+ });
+ });
+ //Reload table after draw
+ $(settings.nTable).trigger('crmLoad');
+ }
+ };
+ //Include any table specific data
+ var settings = $.extend(true, defaults, $(this).data('table'));
+ //Make the DataTables call
+ $(this).DataTable(settings);
+ });
+ };
+
CRM.utils.formatSelect2Result = function (row) {
var markup = '
';
if (row.image !== undefined) {
@@ -840,6 +876,20 @@ CRM.strings = CRM.strings || {};
}
})
.find('input.select-row:checked').parents('tr').addClass('crm-row-selected');
+ $('table.crm-sortable', e.target).DataTable();
+ $('table.crm-ajax-table', e.target).each(function() {
+ var
+ $table = $(this),
+ $accordion = $table.closest('.crm-accordion-wrapper.collapsed, .crm-collapsible.collapsed');
+ // For tables hidden by collapsed accordions, wait.
+ if ($accordion.length) {
+ $accordion.one('crmAccordion:open', function() {
+ $table.crmAjaxTable();
+ });
+ } else {
+ $table.crmAjaxTable();
+ }
+ });
if ($("input:radio[name=radio_ts]").size() == 1) {
$("input:radio[name=radio_ts]").prop("checked", true);
}
@@ -850,6 +900,16 @@ CRM.strings = CRM.strings || {};
$('form[data-warn-changes] :input', e.target).each(function() {
$(this).data('crm-initial-value', $(this).is(':checkbox, :radio') ? $(this).prop('checked') : $(this).val());
});
+ $('textarea.crm-form-wysiwyg', e.target)
+ .not('.crm-wysiwyg-enabled')
+ .addClass('crm-wysiwyg-enabled')
+ .each(function() {
+ if ($(this).hasClass("collapsed")) {
+ CRM.wysiwyg.createCollapsed(this);
+ } else {
+ CRM.wysiwyg.create(this);
+ }
+ });
})
.on('dialogopen', function(e) {
var $el = $(e.target);
@@ -860,7 +920,7 @@ CRM.strings = CRM.strings || {};
}
// Add resize button
if ($el.parent().hasClass('crm-container') && $el.dialog('option', 'resizable')) {
- $el.parent().find('.ui-dialog-titlebar').append($('').button({icons: {primary: 'ui-icon-newwin'}, text: false}));
+ $el.parent().find('.ui-dialog-titlebar').append($('').button({icons: {primary: 'fa-expand'}, text: false}));
$('.crm-dialog-titlebar-resize', $el.parent()).click(function(e) {
if ($el.data('origSize')) {
$el.dialog('option', $el.data('origSize'));
@@ -900,8 +960,7 @@ CRM.strings = CRM.strings || {};
$.fn.crmtooltip = function () {
$(document)
.on('mouseover', 'a.crm-summary-link:not(.crm-processed)', function (e) {
- $(this).addClass('crm-processed');
- $(this).addClass('crm-tooltip-active');
+ $(this).addClass('crm-processed crm-tooltip-active');
var topDistance = e.pageY - $(window).scrollTop();
if (topDistance < 300 || topDistance < $(this).children('.crm-tooltip-wrapper').height()) {
$(this).addClass('crm-tooltip-down');
@@ -914,8 +973,7 @@ CRM.strings = CRM.strings || {};
}
})
.on('mouseout', 'a.crm-summary-link', function () {
- $(this).removeClass('crm-processed');
- $(this).removeClass('crm-tooltip-active crm-tooltip-down');
+ $(this).removeClass('crm-processed crm-tooltip-active crm-tooltip-down');
})
.on('click', 'a.crm-summary-link', false);
};
@@ -1091,7 +1149,7 @@ CRM.strings = CRM.strings || {};
buttons.push({
text: label,
'data-op': op,
- icons: {primary: op === 'no' ? 'ui-icon-close' : 'ui-icon-check'},
+ icons: {primary: op === 'no' ? 'fa-times' : 'fa-check'},
click: function() {
var event = $.Event('crmConfirm:' + op);
$(this).trigger(event);
@@ -1270,15 +1328,6 @@ CRM.strings = CRM.strings || {};
messagesFromMarkup.call($('#crm-container'));
}
- // Hide CiviCRM menubar when editor is fullscreen
- if (window.CKEDITOR) {
- CKEDITOR.on('instanceCreated', function (e) {
- e.editor.on('maximize', function (e) {
- $('#civicrm-menu').toggle(e.data === 2);
- });
- });
- }
-
$('body')
// bind the event for image popup
.on('click', 'a.crm-image-popup', function(e) {
@@ -1317,44 +1366,43 @@ CRM.strings = CRM.strings || {};
})
// Handle accordions
.on('click.crmAccordions', '.crm-accordion-header, .crm-collapsible .collapsible-title', function (e) {
+ var action = 'open';
if ($(this).parent().hasClass('collapsed')) {
$(this).next().css('display', 'none').slideDown(200);
}
else {
$(this).next().css('display', 'block').slideUp(200);
+ action = 'close';
}
- $(this).parent().toggleClass('collapsed');
+ $(this).parent().toggleClass('collapsed').trigger('crmAccordion:' + action);
e.preventDefault();
});
$().crmtooltip();
});
- /**
- * @deprecated
- */
- $.fn.crmAccordions = function () {
- CRM.console('warn', 'Warning: $.crmAccordions was called. This function is deprecated and should not be used.');
- };
+
/**
* Collapse or expand an accordion
* @param speed
*/
$.fn.crmAccordionToggle = function (speed) {
$(this).each(function () {
+ var action = 'open';
if ($(this).hasClass('collapsed')) {
$('.crm-accordion-body', this).first().css('display', 'none').slideDown(speed);
}
else {
$('.crm-accordion-body', this).first().css('display', 'block').slideUp(speed);
+ action = 'close';
}
- $(this).toggleClass('collapsed');
+ $(this).toggleClass('collapsed').trigger('crmAccordion:' + action);
});
};
/**
* Clientside currency formatting
* @param number value
- * @param [optional] boolean onlyNumber - if true, we return formated amount without currency sign
+ * @param [optional] boolean onlyNumber - if true, we return formatted amount without currency sign
* @param [optional] string format - currency representation of the number 1234.56
* @return string
*/