Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
diaspora
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Milan
diaspora
Commits
f676e284
Commit
f676e284
authored
14 years ago
by
archi
Browse files
Options
Downloads
Patches
Plain Diff
Added Youtube links - Still TODO: Caching of titles!
parent
8e753cc0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/helpers/status_messages_helper.rb
+25
-2
25 additions, 2 deletions
app/helpers/status_messages_helper.rb
public/javascripts/view.js
+9
-6
9 additions, 6 deletions
public/javascripts/view.js
with
34 additions
and
8 deletions
app/helpers/status_messages_helper.rb
+
25
−
2
View file @
f676e284
...
...
@@ -3,6 +3,8 @@
# the COPYRIGHT file.
module
StatusMessagesHelper
@@youtube_title_cache
=
Hash
.
new
(
"no-title"
)
def
my_latest_message
unless
@latest_status_message
.
nil?
return
@latest_status_message
.
message
...
...
@@ -17,10 +19,31 @@ module StatusMessagesHelper
# next line is important due to XSS! (h is rail's make_html_safe-function)
message
=
h
(
message
).
html_safe
message
.
gsub!
(
/( |^)(www\.[^ ]+\.[^ ])/
,
'\1http://\2'
)
message
.
gsub!
(
/( |^)http:\/\/www\.youtube\.com\/watch.*v=([A-Za-z0-9_]+)[^ ]*/
,
'\1youtube::\2'
)
message
.
gsub!
(
/( |^)http:\/\/www\.youtube\.com\/watch.*v=([A-Za-z0-9_]+)[^ ]*/
,
'\1youtube
.com
::\2'
)
message
.
gsub!
(
/(http|ftp):\/\/([^ ]+)/
,
'<a target="_blank" href="\1://\2">\2</a>'
)
message
.
gsub!
(
/youtube::([A-Za-z0-9_]+)/
,
'<a name="\1" onclick="openYoutube(\'\1\', this)" href="#\1">Youtube: \1</a>'
)
youtube
=
message
.
match
(
/youtube\.com::([A-Za-z0-9_]+)/
)
youtube
.
to_a
.
each
do
|
videoid
|
if
videoid
.
match
(
'::'
).
nil?
message
.
gsub!
(
'youtube.com::'
+
videoid
,
'<a onclick="openVideo(\'youtube.com\', \''
+
videoid
+
'\', this)" href="#video">Youtube: '
+
youtube_title
(
videoid
)
+
'</a>'
)
end
end
return
message
end
def
youtube_title
(
id
)
#TODO Check if id is cached, and return cached value
ret
=
'Unknown Video Title'
#TODO add translation
http
=
Net
::
HTTP
.
new
(
'gdata.youtube.com'
,
80
)
path
=
'/feeds/api/videos/'
+
id
+
'?v=2'
resp
,
data
=
http
.
get
(
path
,
nil
)
title
=
data
.
match
(
/<title>(.*)<\/title>/
)
unless
title
.
nil?
ret
=
title
.
to_s
[
7
..-
9
]
end
#TODO Cache the value of ret for id
return
ret
end
end
This diff is collapsed.
Click to expand it.
public/javascripts/view.js
+
9
−
6
View file @
f676e284
...
...
@@ -72,12 +72,15 @@ $.fn.clearForm = function() {
});
};
function
open
Youtube
(
videoid
,
link
)
{
function
open
Video
(
type
,
videoid
,
link
)
{
var
container
=
document
.
createElement
(
'
div
'
);
container
.
innerHTML
=
'
<object width="640" height="385"><param name="movie" value="http://www.youtube.com/v/
'
+
videoid
+
'
?fs=1"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/
'
+
videoid
+
'
?fs=1" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="640" height="385"></embed></object><br><a href="#
'
+
videoid
+
'
" onclick="closeYoutube(this)">Close</a> <a href="http://www.youtube.com/watch?v=
'
+
videoid
+
'
" target="_blank">Watch on Youtube</a>
'
;
if
(
type
==
'
youtube.com
'
)
{
container
.
innerHTML
=
'
<a href="http://www.youtube.com/watch?v=
'
+
videoid
+
'
" target="_blank">Watch this video on Youtube</a><br><object width="640" height="385"><param name="movie" value="http://www.youtube.com/v/
'
+
videoid
+
'
?fs=1"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/
'
+
videoid
+
'
?fs=1" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="640" height="385"></embed></object>
'
;
}
else
{
container
.
innerHTML
=
'
Invalid videotype <i>
'
+
type
+
'
</i> (ID:
'
+
videoid
+
'
)
'
;
}
$
(
container
).
hide
();
link
.
parentNode
.
insertBefore
(
container
,
this
.
nextSibling
);
}
function
closeYoutube
(
link
)
{
link
.
parentNode
.
parentNode
.
removeChild
(
link
.
parentNode
);
$
(
container
).
slideDown
(
'
fast
'
,
function
()
{
});
link
.
onclick
=
function
()
{
$
(
container
).
slideToggle
(
'
fast
'
,
function
()
{
}
);
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment