Version 4.1.19
This commit is contained in:
1 parent
28bd025b35
commit
2bd5025018
2674 files changed
+233518
-77766
No files matched your search
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<javascript app="calendar">
|
||||
<file javascript_app="calendar" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.main.js" javascript_type="controller" javascript_version="101012" javascript_position="1000050"><![CDATA[/**
|
||||
* IPS Social Suite 4
|
||||
<file javascript_app="calendar" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.main.js" javascript_type="controller" javascript_version="101093" javascript_position="1000050"><![CDATA[/**
|
||||
* IPS Community Suite 4
|
||||
* (c) 2013 Invision Power Services - http://www.invisionpower.com
|
||||
*
|
||||
* ips.browse.main.js - Calendar main browsing controller
|
||||
@@ -60,6 +60,9 @@
|
||||
return;
|
||||
}
|
||||
|
||||
// Track page view
|
||||
ips.utils.analytics.trackPageView( state.url );
|
||||
|
||||
this._updateView( state.url, state.title )
|
||||
},
|
||||
|
||||
@@ -109,8 +112,8 @@
|
||||
}
|
||||
});
|
||||
}(jQuery, _));]]></file>
|
||||
<file javascript_app="calendar" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.monthView.js" javascript_type="controller" javascript_version="101012" javascript_position="1000050"><![CDATA[/**
|
||||
* IPS Social Suite 4
|
||||
<file javascript_app="calendar" javascript_location="front" javascript_path="controllers/browse" javascript_name="ips.browse.monthView.js" javascript_type="controller" javascript_version="101093" javascript_position="1000050"><![CDATA[/**
|
||||
* IPS Community Suite 4
|
||||
* (c) 2013 Invision Power Services - http://www.invisionpower.com
|
||||
*
|
||||
* ips.browse.monthView.js - Month view controller
|
||||
@@ -251,8 +254,8 @@
|
||||
}
|
||||
});
|
||||
}(jQuery, _));]]></file>
|
||||
<file javascript_app="calendar" javascript_location="front" javascript_path="controllers/submit" javascript_name="ips.submit.dates.js" javascript_type="controller" javascript_version="101012" javascript_position="1000100"><![CDATA[/**
|
||||
* IPS Social Suite 4
|
||||
<file javascript_app="calendar" javascript_location="front" javascript_path="controllers/submit" javascript_name="ips.submit.dates.js" javascript_type="controller" javascript_version="101093" javascript_position="1000100"><![CDATA[/**
|
||||
* IPS Community Suite 4
|
||||
* (c) 2013 Invision Power Services - http://www.invisionpower.com
|
||||
*
|
||||
* ips.submit.dates.js - Helper for date selection enhancements
|
||||
@@ -442,37 +445,6 @@
|
||||
// Update the dates
|
||||
this.scope.find('[data-role="dateSummary"]').html( this._dateSummary() );
|
||||
},
|
||||
|
||||
/**
|
||||
* Get date object from input
|
||||
*
|
||||
* @param {object} input Input element
|
||||
* @returns {object} Date object
|
||||
*/
|
||||
_getDate: function(input) {
|
||||
/* jQuery UI Polyfill needs to be changed into the correct format */
|
||||
if( !ips.utils.time.supportsHTMLDate() ) {
|
||||
/* If it has been initiated, we can use the getDate method */
|
||||
try {
|
||||
var thisDate = input.datepicker( "getDate" );
|
||||
|
||||
if( _.isNull( thisDate ) )
|
||||
{
|
||||
thisDate = new Date( input.attr('value') );
|
||||
}
|
||||
|
||||
return thisDate;
|
||||
}
|
||||
/* If it hasn't we can pull the 'value' attribute which can't have been changed yet. Not .val() as that will be in the wrong format */
|
||||
catch(err) {
|
||||
return new Date( input.attr('value') );
|
||||
}
|
||||
}
|
||||
/* Actual HTML5 input always returns .val() in the correct YYYY-MM-DD format */
|
||||
else {
|
||||
return new Date( input.val() );
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Builds a summary of the selected dates/times
|
||||
@@ -481,32 +453,26 @@
|
||||
*/
|
||||
_dateSummary: function () {
|
||||
// Build start date
|
||||
var startDate = this._getDate( this.scope.find('input[name="event_dates[start_date]"]') );
|
||||
var startDate = ips.utils.time.getDateFromInput( this.scope.find('input[name="event_dates[start_date]"]') );
|
||||
var singleDay = this.scope.find('#check_single_day');
|
||||
var allDay = this.scope.find('#check_all_day');
|
||||
|
||||
// If there's no start time, then abandon showing any summary for now
|
||||
if( !ips.utils.time.isValidDateObj( startDate ) || startDate.getFullYear() < 1900 ) {
|
||||
return '';
|
||||
}
|
||||
}
|
||||
|
||||
// We need to add the offset to ensure the day stays correct
|
||||
if( !ips.utils.time.supportsHTMLDate() ){
|
||||
startDate.setTime( startDate.getTime() - new Date().getTimezoneOffset()*60000 );
|
||||
}
|
||||
ips.utils.time.removeTimezone( startDate );
|
||||
|
||||
var startDateString = ips.utils.time.localeDateString( startDate, { weekday: 'short', month: 'short', day: 'numeric', year: 'numeric', timeZone: 'UTC' } );
|
||||
|
||||
var startTime = this._getTime( this.scope.find('input[name="event_dates[start_time]"]').val() );
|
||||
var endTime = this._getTime( this.scope.find('input[name="event_dates[end_time]"]').val() );
|
||||
var endDate = this._getDate( this.scope.find('input[name="event_dates[end_date]"]') );
|
||||
var endDate = ips.utils.time.getDateFromInput( this.scope.find('input[name="event_dates[end_date]"]') );
|
||||
var endDateString = '';
|
||||
|
||||
// If we have a valid end date...
|
||||
if( !singleDay.is(':checked') && ips.utils.time.isValidDateObj( endDate ) ){
|
||||
if( !ips.utils.time.supportsHTMLDate() ){
|
||||
endDate.setTime( endDate.getTime() - new Date().getTimezoneOffset()*60000 );
|
||||
}
|
||||
ips.utils.time.removeTimezone( endDate );
|
||||
endDateString = ips.utils.time.localeDateString( endDate, { weekday: 'short', month: 'short', day: 'numeric', year: 'numeric', timeZone: 'UTC' } );
|
||||
}
|
||||
|
||||
@@ -570,7 +536,7 @@
|
||||
endString = ips.pluralize( ips.getString( 'x_times' ), occurrences );
|
||||
}
|
||||
} else if( this.scope.find('#event_repeat_end_ondate').is(':checked') ){
|
||||
var dateObj = this._getDate( this.scope.find('input[name="event_dates[repeat_end_date]"]') );
|
||||
var dateObj = ips.utils.time.getDateFromInput( this.scope.find('input[name="event_dates[repeat_end_date]"]') );
|
||||
|
||||
if( ips.utils.time.isValidDateObj( dateObj ) && dateObj.getFullYear() > 1900 ){ // > 1900 just so it doesn't start updating on year 19 etc.
|
||||
endString = ips.getString('until', { date: ips.utils.time.localeDateString( dateObj, { weekday: 'short', month: 'short', day: 'numeric', year: 'numeric' } ) } );
|
||||
@@ -649,6 +615,7 @@
|
||||
});
|
||||
}(jQuery, _));]]></file>
|
||||
<order app="global" path="/dev/js//framework/">templates
|
||||
common/ips.loader.js
|
||||
common/ui
|
||||
common/utils
|
||||
common
|
||||
@@ -662,6 +629,4 @@ app.js</order>
|
||||
<order app="global" path="/dev/js//library//jquery">jquery.js
|
||||
jquery.history.js
|
||||
jquery.transform.js</order>
|
||||
<order app="global" path="/dev/js//library//xregexp">xregexp-all.js
|
||||
xregexp-lookbehind.js</order>
|
||||
</javascript>
|
||||
Reference in new issue
Block a user