Skip to content

Commit

Permalink
Fix ticket 56220: Embed Youtube video's in Hybrid
Browse files Browse the repository at this point in the history
  • Loading branch information
Jelte Lagendijk committed Oct 3, 2017
1 parent 54f1cd2 commit ae72319
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
Binary file modified dist/CKEditorForMendix.mpk
Binary file not shown.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "CKEditorForMendix",
"version": "2.4.5",
"version": "2.4.6",
"description": "A new WYSIWYG editor for Mendix that also has the ability to create MicroFlow links in your HTML output.",
"license": "Apache License, Version 2",
"author": "Mendix",
Expand Down Expand Up @@ -34,4 +34,4 @@
"folders": "node ./node_modules/gulp/bin/gulp folders",
"modeler": "node ./node_modules/gulp/bin/gulp modeler"
}
}
}
4 changes: 2 additions & 2 deletions src/CKEditorForMendix/widget/lib/jquery.oembed.js
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@
$.fn.oembed.providers = [

//Video
new $.fn.oembed.OEmbedProvider("youtube", "video", ["youtube\\.com/watch.+v=[\\w-]+&?", "youtu\\.be/[\\w-]+", "youtube.com/embed"], '//www.youtube.com/embed/$1?wmode=transparent', {
new $.fn.oembed.OEmbedProvider("youtube", "video", ["youtube\\.com/watch.+v=[\\w-]+&?", "youtu\\.be/[\\w-]+", "youtube.com/embed"], 'https://www.youtube.com/embed/$1?wmode=transparent', {
templateRegex: /.*(?:v\=|be\/|embed\/)([\w\-]+)&?.*/, embedtag: {tag: 'iframe', width: '425', height: '349'}
}),

Expand Down Expand Up @@ -596,7 +596,7 @@
new $.fn.oembed.OEmbedProvider("sapo", "video", ["videos\\.sapo\\.pt/.*"], "http://videos.sapo.pt/oembed", {useYQL: 'json'}),
new $.fn.oembed.OEmbedProvider("vodpod", "video", ["vodpod.com/watch/.*"], "http://vodpod.com/oembed.js", {useYQL: 'json'}),
new $.fn.oembed.OEmbedProvider("vimeo", "video", ["www\.vimeo\.com\/groups\/.*\/videos\/.*", "www\.vimeo\.com\/.*", "vimeo\.com\/groups\/.*\/videos\/.*", "vimeo\.com\/.*"], "//vimeo.com/api/oembed.json"),
new $.fn.oembed.OEmbedProvider("dailymotion", "video", ["dailymotion\\.com/.+"], '//www.dailymotion.com/services/oembed'),
new $.fn.oembed.OEmbedProvider("dailymotion", "video", ["dailymotion\\.com/.+"], 'https://www.dailymotion.com/services/oembed'),
new $.fn.oembed.OEmbedProvider("5min", "video", ["www\\.5min\\.com/.+"], 'http://api.5min.com/oembed.xml', {useYQL: 'xml'}),
new $.fn.oembed.OEmbedProvider("National Film Board of Canada", "video", ["nfb\\.ca/film/.+"], 'http://www.nfb.ca/remote/services/oembed/', {useYQL: 'json'}),
new $.fn.oembed.OEmbedProvider("qik", "video", ["qik\\.com/\\w+"], 'http://qik.com/api/oembed.json', {useYQL: 'json'}),
Expand Down
2 changes: 1 addition & 1 deletion src/package.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://www.mendix.com/package/1.0/">
<clientModule name="CKEditorForMendix" version="2.4.5" xmlns="http://www.mendix.com/clientModule/1.0/">
<clientModule name="CKEditorForMendix" version="2.4.6" xmlns="http://www.mendix.com/clientModule/1.0/">
<widgetFiles>
<widgetFile path="CKEditorForMendix/CKEditorForMendix.xml"/>
<widgetFile path="CKEditorForMendix/CKEditorViewerForMendix.xml"/>
Expand Down
Binary file modified test/widgets/CKEditorForMendix.mpk
Binary file not shown.

0 comments on commit ae72319

Please sign in to comment.