mirror of
https://github.com/ansible/awx.git
synced 2026-01-13 02:50:02 -03:30
Updated angular-scheduler to pickup latest fixes.
This commit is contained in:
Chris Houseknecht
parent
2eeecb01a7
commit
33a8eaae90
48
awx/ui/static/lib/angular-scheduler/.bower.json
Normal file
48
awx/ui/static/lib/angular-scheduler/.bower.json
Normal file
@ -0,0 +1,48 @@
|
||||
{
|
||||
"name": "angular-scheduler",
|
||||
"version": "0.0.4",
|
||||
"authors": [
|
||||
"Chris Houseknecht <chouse@ansible.com>"
|
||||
],
|
||||
"description": "Angular based UI widget for creating repeat schedule entries.",
|
||||
"license": "MIT",
|
||||
"ignore": [
|
||||
"**/.*",
|
||||
"node_modules",
|
||||
"bower_components",
|
||||
"test",
|
||||
"tests"
|
||||
],
|
||||
"devDependencies": {
|
||||
"angular-route": "*",
|
||||
"components-font-awesome": "*",
|
||||
"jquery": "*",
|
||||
"jqueryui": "*",
|
||||
"less": "*",
|
||||
"angular-mocks": "~1.2.13"
|
||||
},
|
||||
"dependencies": {
|
||||
"angular": "~1.2.14",
|
||||
"underscore": "*",
|
||||
"bootstrap": "~3.1.1",
|
||||
"rrule": "*",
|
||||
"timezone-js": "*",
|
||||
"angular-tz-extensions": "*"
|
||||
},
|
||||
"homepage": "https://github.com/chouseknecht/angular-scheduler",
|
||||
"main": "git@github.com:chouseknecht/angular-scheduler.git",
|
||||
"keywords": [
|
||||
"schedule",
|
||||
"rrule",
|
||||
"calendar"
|
||||
],
|
||||
"_release": "0.0.4",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "v0.0.4",
|
||||
"commit": "ecde5da79b5bd3b468cd14fc2784e17a8f7e6eee"
|
||||
},
|
||||
"_source": "git://github.com/chouseknecht/angular-scheduler.git",
|
||||
"_target": "~0.0.4",
|
||||
"_originalSource": "angular-scheduler"
|
||||
}
|
||||
@ -3,7 +3,7 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Angular Scheduler | Sample application</title>
|
||||
<link rel="stylesheet" href="/bower_components/twitter/dist/css/bootstrap.min.css" >
|
||||
<link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css" >
|
||||
<link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css" >
|
||||
<link rel="stylesheet" href="/bower_components/jqueryui/themes/redmond/jquery-ui.min.css" >
|
||||
<link rel="stylesheet" href="/lib/angular-scheduler.css" >
|
||||
@ -43,7 +43,7 @@
|
||||
<script src="/bower_components/less/dist/less-1.6.2.min.js"></script>
|
||||
<script src="/bower_components/jquery/dist/jquery.min.js"></script>
|
||||
<script src="/bower_components/jqueryui/ui/minified/jquery-ui.min.js"></script>
|
||||
<script src="/bower_components/twitter/dist/js/bootstrap.min.js"></script>
|
||||
<script src="/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
|
||||
|
||||
<!-- timezone -->
|
||||
<script src="/bower_components/timezone-js/src/date.js"></script>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "angular-scheduler",
|
||||
"version": "0.0.3",
|
||||
"version": "0.0.4",
|
||||
"authors": [
|
||||
"Chris Houseknecht <chouse@ansible.com>"
|
||||
],
|
||||
|
||||
@ -10,10 +10,9 @@
|
||||
@chouseknecht
|
||||
chouse@ansible.com
|
||||
-->
|
||||
|
||||
<div id="scheduler-detail">
|
||||
<div class="alert alert-danger" ng-show="!schedulerIsValid">
|
||||
<p>The scheduler options are invalid or incomplete. Make the needed changes, then return here to view occurrence details.</p>
|
||||
<p>The scheduler options are invalid or incomplete. Make the needed changes on the options tab, then come back here to see details.</p>
|
||||
</div>
|
||||
<div ng-show="schedulerIsValid">
|
||||
<div class="form-group">
|
||||
|
||||
@ -638,11 +638,11 @@ angular.module('AngularScheduler', ['underscore'])
|
||||
if (key === 'DTSTART') {
|
||||
// The form has been reset to the local zone
|
||||
setStartDate = true;
|
||||
if (/\d{8}T\d{6}Z/.test(value)) {
|
||||
if (/\d{8}T\d{6}.*Z/.test(value)) {
|
||||
// date may come in without separators. add them so new Date constructor will work
|
||||
value = value.replace(/(\d{4})(\d{2})(\d{2}T)(\d{2})(\d{2})(\d{2}Z)/,
|
||||
value = value.replace(/(\d{4})(\d{2})(\d{2}T)(\d{2})(\d{2})(\d{2}.*$)/,
|
||||
function(match, p1, p2, p3, p4,p5,p6) {
|
||||
return p1 + '-' + p2 + '-' + p3 + p4 + ':' + p5 + ':' + p6;
|
||||
return p1 + '-' + p2 + '-' + p3 + p4 + ':' + p5 + ':' + p6.substr(0,2) + 'Z';
|
||||
});
|
||||
}
|
||||
if (useTimezone) {
|
||||
@ -660,7 +660,7 @@ angular.module('AngularScheduler', ['underscore'])
|
||||
scope.schedulerStartDt = value.replace(/T.*$/,'');
|
||||
scope.schedulerStartHour = timeString.substr(0,2);
|
||||
scope.schedulerStartMinute = timeString.substr(3,2);
|
||||
scope.schedulerStartMinute = timeString.substr(6,2);
|
||||
scope.schedulerStartSecond = timeString.substr(6,2);
|
||||
}
|
||||
scope.scheduleTimeChange();
|
||||
}
|
||||
@ -695,11 +695,11 @@ angular.module('AngularScheduler', ['underscore'])
|
||||
}
|
||||
|
||||
if (key === 'UNTIL') {
|
||||
if (/\d{8}T\d{6}Z/.test(value)) {
|
||||
if (/\d{8}T\d{6}.*Z/.test(value)) {
|
||||
// date may come in without separators. add them so new Date constructor will work
|
||||
value = value.replace(/(\d{4})(\d{2})(\d{2}T)(\d{2})(\d{2})(\d{2}Z)/,
|
||||
value = value.replace(/(\d{4})(\d{2})(\d{2}T)(\d{2})(\d{2})(\d{2}.*$)/,
|
||||
function(match, p1, p2, p3, p4,p5,p6) {
|
||||
return p1 + '-' + p2 + '-' + p3 + p4 + ':' + p5 + ':' + p6;
|
||||
return p1 + '-' + p2 + '-' + p3 + p4 + ':' + p5 + ':' + p6.substr(0,2) + 'Z';
|
||||
});
|
||||
}
|
||||
scope.schedulerEnd = scope.endOptions[2];
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -15,7 +15,7 @@
|
||||
"angular-md5": "~0.1.7",
|
||||
"angular-resource": "~1.2.12",
|
||||
"angular-sanitize": "~1.2.12",
|
||||
"angular-scheduler": "~0.0.3",
|
||||
"angular-scheduler": "~0.0.4",
|
||||
"bootstrap": "~3.1.1",
|
||||
"components-font-awesome": "~4.0.3",
|
||||
"less.js": "~1.6.3",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user