Skip to content

Commit

Permalink
removed jQuery.noConflict(true), this allows URL to work
Browse files Browse the repository at this point in the history
  • Loading branch information
acellam committed Jun 18, 2015
1 parent 7beb13e commit ea066df
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 27 deletions.
11 changes: 7 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -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 ?
Expand All @@ -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/)
15 changes: 3 additions & 12 deletions src/AudioVideoPlayback/widget/AudioVideoPlayback.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
========================
Expand All @@ -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"));
Expand Down Expand Up @@ -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();
Expand All @@ -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");
Expand All @@ -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({
Expand Down Expand Up @@ -196,16 +190,13 @@ 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();
},

// 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();
Expand Down
2 changes: 1 addition & 1 deletion src/AudioVideoPlayback/widget/AudioVideoPlaybackEmbed.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
========================
Expand Down
11 changes: 1 addition & 10 deletions src/AudioVideoPlayback/widget/AudioVideoPlaybackURL.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
========================
Expand All @@ -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"));
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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();
Expand Down
Binary file modified test/AudioVideoPlayback.mpr
Binary file not shown.
Binary file modified test/widgets/AudioVideoPlayback.mpk
Binary file not shown.

0 comments on commit ea066df

Please sign in to comment.