BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
e5a968c4
Commit
e5a968c4
authored
Nov 18, 2016
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move timeago.js to vendor directory
parent
536ec509
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
application.js
app/assets/javascripts/application.js
+1
-0
timeago.js
vendor/assets/javascripts/timeago.js
+3
-6
No files found.
app/assets/javascripts/application.js
View file @
e5a968c4
...
...
@@ -19,6 +19,7 @@
/*= require jquery.scrollTo */
/*= require jquery.turbolinks */
/*= require js.cookie */
/*= require timeago */
/*= require turbolinks */
/*= require autosave */
/*= require bootstrap/affix */
...
...
app/assets/javascripts/lib/util
s/timeago.js
→
vendor/assets/javascript
s/timeago.js
View file @
e5a968c4
/* eslint-disable no-unused-expressions, wrap-iife, func-names, curly, no-param-reassign, no-trailing-spaces, prefer-arrow-callback, no-var, one-var, quote-props, space-before-function-paren, vars-on-top, radix, prefer-template, space-infix-ops, no-use-before-define, newline-per-chained-call, no-useless-escape, no-nested-ternary, indent, no-undef, no-plusplus, one-var-declaration-per-line, operator-assignment, consistent-return, keyword-spacing, max-len, space-unary-ops, no-shadow, no-restricted-syntax, guard-for-in, eol-last, max-len */
/**
* Copyright (c) 2016 hustcc
* License: MIT
...
...
@@ -14,7 +12,7 @@
module
.
exports
=
factory
(
root
);
else
root
.
timeago
=
factory
(
root
);
}(
typeof
window
!==
'undefined'
?
window
:
this
,
}(
typeof
window
!==
'undefined'
?
window
:
this
,
function
()
{
var
cnt
=
0
,
// the timer counter, for timer key
indexMapEn
=
'second_minute_hour_day_week_month_year'
.
split
(
'_'
),
...
...
@@ -32,7 +30,7 @@ function () {
SEC_ARRAY
=
[
60
,
60
,
24
,
7
,
365
/
7
/
12
,
12
],
SEC_ARRAY_LEN
=
6
,
ATTR_DATETIME
=
'datetime'
;
// format Date / string / timestamp to Date instance.
function
toDate
(
input
)
{
if
(
input
instanceof
Date
)
return
input
;
...
...
@@ -236,4 +234,4 @@ function () {
};
return
timeagoFactory
;
});
\ No newline at end of file
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment