Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
app/assets/javascripts/application.js
app/assets/javascripts/application.js
+1
-0
vendor/assets/javascripts/timeago.js
vendor/assets/javascripts/timeago.js
+3
-5
No files found.
app/assets/javascripts/application.js
View file @
e5a968c4
...
@@ -19,6 +19,7 @@
...
@@ -19,6 +19,7 @@
/*= require jquery.scrollTo */
/*= require jquery.scrollTo */
/*= require jquery.turbolinks */
/*= require jquery.turbolinks */
/*= require js.cookie */
/*= require js.cookie */
/*= require timeago */
/*= require turbolinks */
/*= require turbolinks */
/*= require autosave */
/*= require autosave */
/*= require bootstrap/affix */
/*= 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
* Copyright (c) 2016 hustcc
* License: MIT
* License: MIT
...
@@ -14,7 +12,7 @@
...
@@ -14,7 +12,7 @@
module
.
exports
=
factory
(
root
);
module
.
exports
=
factory
(
root
);
else
else
root
.
timeago
=
factory
(
root
);
root
.
timeago
=
factory
(
root
);
}(
typeof
window
!==
'
undefined
'
?
window
:
this
,
}(
typeof
window
!==
'
undefined
'
?
window
:
this
,
function
()
{
function
()
{
var
cnt
=
0
,
// the timer counter, for timer key
var
cnt
=
0
,
// the timer counter, for timer key
indexMapEn
=
'
second_minute_hour_day_week_month_year
'
.
split
(
'
_
'
),
indexMapEn
=
'
second_minute_hour_day_week_month_year
'
.
split
(
'
_
'
),
...
@@ -32,7 +30,7 @@ function () {
...
@@ -32,7 +30,7 @@ function () {
SEC_ARRAY
=
[
60
,
60
,
24
,
7
,
365
/
7
/
12
,
12
],
SEC_ARRAY
=
[
60
,
60
,
24
,
7
,
365
/
7
/
12
,
12
],
SEC_ARRAY_LEN
=
6
,
SEC_ARRAY_LEN
=
6
,
ATTR_DATETIME
=
'
datetime
'
;
ATTR_DATETIME
=
'
datetime
'
;
// format Date / string / timestamp to Date instance.
// format Date / string / timestamp to Date instance.
function
toDate
(
input
)
{
function
toDate
(
input
)
{
if
(
input
instanceof
Date
)
return
input
;
if
(
input
instanceof
Date
)
return
input
;
...
@@ -236,4 +234,4 @@ function () {
...
@@ -236,4 +234,4 @@ function () {
};
};
return
timeagoFactory
;
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