diff --git a/README.md b/README.md index f4e0c30..1d1eb65 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [AudioVideoPlayBack ](https://appstore.home.mendix.com/index.html?v=7#1400594764694) : HTML5 Audio & Video for [Mendix](http://mendix.com/) +# [AudioVideoPlayBack ](https://appstore.home.mendix.com/index.html?v=7#1400594764694) : HTML5/Flash Audio & Video for [Mendix](http://mendix.com/) ## What is AudioVideoPlayBack ? @@ -23,14 +23,17 @@ ### AudioVideoPlayBack supports: -* HTML5: **mp3, m4a (AAC), m4v (H.264),** ogv*, oga*, wav*, webm* -* Flash: **mp3, m4a (AAC), m4v (H.264),** rtmp, flv. +* HTML5: **mp3, mp4 (AAC/H.264), ogg (Vorbis/Theora), webm (Vorbis/VP8), wav +* Flash: **mp3, mp4 (AAC/H.264), rtmp, flv + +### Test Music Files: +* [HTML5 webm-ogg-mp4](http://techslides.com/sample-webm-ogg-and-mp4-video-files-for-html5) ## License [AudioVideoPlayBack](https://appstore.home.mendix.com/index.html?v=7#1400594764694) is licensed under the [Apache 2.0 License](http://www.apache.org/licenses/). ## More information: -* [Flockofbirds.org](http://flockofbirds.org/) * [jPlayer.org](http://jplayer.org/) * [Quick Start Guide](https://www.youtube.com/watch?v=Vf78fTj4S2M) * [Developer Guide and API Reference](http://www.jplayer.org/latest/developer-guide/) +* [Flockofbirds.org](http://flockofbirds.org/) diff --git a/src/AudioVideoPlayback/widget/AudioVideoPlayback.js b/src/AudioVideoPlayback/widget/AudioVideoPlayback.js index ac469e6..644010e 100644 --- a/src/AudioVideoPlayback/widget/AudioVideoPlayback.js +++ b/src/AudioVideoPlayback/widget/AudioVideoPlayback.js @@ -10,7 +10,7 @@ @author : Acellam Guy @date : Tue, 16 Jun 2015 10:16:07 GMT @copyright : Flock Of Birds - @license : MIT + @license : Apache 2.0 License Documentation ======================== @@ -25,7 +25,7 @@ define([ ], function (declare, _WidgetBase, _TemplatedMixin, dom, dojoDom, domQuery, domProp, domGeom, domClass, domStyle, domConstruct, dojoArray, lang, text, html, event, _jQuery, widgetTemplate) { 'use strict'; - var $ = jQuery.noConflict(true); + //var $ = jQuery.noConflict(true); mxui.dom.addCss(dojo.moduleUrl("AudioVideoPlayback", "widget/ui/blue.monday/jplayer.blue.monday.css")); @@ -78,8 +78,6 @@ define([ domStyle.set(this.jpPlayerUI, "display", ""); domStyle.set(this.jpPlayer, "display", ""); - console.info("Extension is:"+ext); - this.choosePlayer(context, ext); this.showHideControlls(); @@ -101,9 +99,7 @@ define([ } }, audio: function (context) { - - console.info("file guid:"+context.trackId); - + var self = this; dojo.removeClass(this.jpPlayerUI, "jp-video"); dojo.addClass(this.jpPlayerUI, "jp-audio"); @@ -125,8 +121,6 @@ define([ video: function (context) { var self = this; - console.info("file guid:"+context.trackId); - dojo.removeClass(this.jpPlayerUI, "jp-audio"); dojo.addClass(this.jpPlayerUI, "jp-video"); $(this.jpPlayer).jPlayer({ @@ -196,7 +190,6 @@ define([ // dijit._WidgetBase.postCreate is called after constructing the widget. Implement to do extra setup work. postCreate: function () { - console.log(this.id + '.postCreate'); this._updateRendering(); this._setupEvents(); @@ -204,8 +197,6 @@ define([ // mxui.widget._WidgetBase.update is called when context is changed or initialized. Implement to re-render and / or fetch data. update: function (obj, callback) { - console.log(this.id + '.update'); - this._contextObj = obj; this._resetSubscriptions(); this._updateRendering(); diff --git a/src/AudioVideoPlayback/widget/AudioVideoPlaybackEmbed.js b/src/AudioVideoPlayback/widget/AudioVideoPlaybackEmbed.js index 8cc3aa0..0f8f7c5 100644 --- a/src/AudioVideoPlayback/widget/AudioVideoPlaybackEmbed.js +++ b/src/AudioVideoPlayback/widget/AudioVideoPlaybackEmbed.js @@ -10,7 +10,7 @@ @author : Acellam Guy @date : Tue, 16 Jun 2015 10:16:07 GMT @copyright : Flock Of Birds - @license : MIT + @license : Apache 2.0 License Documentation ======================== diff --git a/src/AudioVideoPlayback/widget/AudioVideoPlaybackURL.js b/src/AudioVideoPlayback/widget/AudioVideoPlaybackURL.js index 71f2645..53b50a0 100644 --- a/src/AudioVideoPlayback/widget/AudioVideoPlaybackURL.js +++ b/src/AudioVideoPlayback/widget/AudioVideoPlaybackURL.js @@ -10,7 +10,7 @@ @author : Acellam Guy @date : Tue, 16 Jun 2015 10:16:07 GMT @copyright : Flock Of Birds - @license : MIT + @license : Apache 2.0 License Documentation ======================== @@ -24,9 +24,6 @@ define([ 'AudioVideoPlayback/lib/jquery-1.11.2.min', 'dojo/text!AudioVideoPlayback/widget/template/playback.html','AudioVideoPlayback/lib/jQueryjPlayer/jquery.jplayer' ], function (declare, _WidgetBase, _TemplatedMixin, dom, dojoDom, domQuery, domProp, domGeom, domClass, domStyle, domConstruct, dojoArray, lang, text, html, event, _jQuery, widgetTemplate) { 'use strict'; - - //var $ = jQuery.noConflict(true); - mxui.dom.addCss(dojo.moduleUrl("AudioVideoPlayback", "widget/ui/blue.monday/jplayer.blue.monday.css")); mxui.dom.addCss(dojo.moduleUrl("AudioVideoPlayback", "widget/ui/playback.css")); @@ -169,10 +166,6 @@ define([ // dijit._WidgetBase.postCreate is called after constructing the widget. Implement to do extra setup work. postCreate: function () { - console.log(this.id + '.postCreate'); - - - this.actLoaded(); //destroy if need be (allow shitching, between audio, video or deselecting) @@ -204,8 +197,6 @@ define([ // mxui.widget._WidgetBase.update is called when context is changed or initialized. Implement to re-render and / or fetch data. update: function (obj, callback) { - console.log(this.id + '.update'); - this._contextObj = obj; this._resetSubscriptions(); this._updateRendering(); diff --git a/test/AudioVideoPlayback.mpr b/test/AudioVideoPlayback.mpr index 2a83f1e..9d75e2f 100644 Binary files a/test/AudioVideoPlayback.mpr and b/test/AudioVideoPlayback.mpr differ diff --git a/test/widgets/AudioVideoPlayback.mpk b/test/widgets/AudioVideoPlayback.mpk index 03a939b..0f272fd 100644 Binary files a/test/widgets/AudioVideoPlayback.mpk and b/test/widgets/AudioVideoPlayback.mpk differ