New resource loader #64

Merged
merged 449 commits into from Aug 20, 2012

5 participants

@mdale

This pull requests tracks the newResourceLoader merge for the 1.7 milestone

@mdale

note this branch is not yet stable, but I want to track it as part of 1.7 milestone so the pull request is listed here.

@KalturaGitBot

Updated pull request 64: e754b6e

@KalturaGitBot

Updated pull request 64: 98cb440

@KalturaGitBot

Live Pull Request Urls

@KalturaGitBot

Updated pull request 64: 011138d

@KalturaGitBot

Live Pull Request Urls

@KalturaGitBot

Updated pull request 64: e743231

@KalturaGitBot

Live Pull Request Urls

@KalturaGitBot

Updated pull request 64: 4f6e442

@KalturaGitBot

Live Pull Request Urls

@KalturaGitBot

Updated pull request 64: d7b4316

Michael Dale fixed ad companions for no iframe api
-- added try catch around parsing ad xml, prevents player lockup on
invalid xml
-- rewrote companion display for friendly iframes
a349367
@KalturaGitBot

Updated pull request 64: a349367

@KalturaGitBot

Updated pull request 64: 311f0bd

@KalturaGitBot

Live Pull Request Urls

Michael Dale added some commits Jun 28, 2012
Michael Dale Test KWidget Override Without Destroy d421740
Michael Dale Merge branch 'develop' into newResourceLoader
Conflicts:
	modules/EmbedPlayer/resources/mw.EmbedPlayer.js
	modules/KalturaSupport/resources/mw.KDPMapping.js
	modules/KalturaSupport/resources/mw.KWidgetSupport.js
	modules/TimedText/resources/mw.TimedText.js
9ddd15d
Michael Dale removed broken merge d97a688
@KalturaGitBot

Updated pull request 64: d97a688

Michael Dale white space fix 776dfec
@KalturaGitBot

Updated pull request 64: 776dfec

Michael Dale and others added some commits Jun 29, 2012
Michael Dale Merge branch 'develop' into newResourceLoader
Conflicts:
	includes/DefaultSettings.php
	modules/EmbedPlayer/resources/mw.EmbedPlayer.js
610fd04
Michael Dale fixed kalturaLogo check by including myLogo.js for kalturaLogo plugins f918fce
Michael Dale mw.supportsFlash method should check for flash 10 d69308b
Michael Dale fixed typo 568a0d8
Michael Dale special case the iPhone flavor in download script for most compatible 9f01a0e
Michael Dale special case the link player display mode d6890a8
Michael Dale add check for player when extendingJsListener
TODO figure out why player is null at this time.
1331519
Michael Dale removed hack JSON.stringify in favor of json2.js for old browsers
-- We need JSON.stringify for old browsers that don't have JSON
support. It was recently discovered the version in kWidget does not
work.
e58ba9e
Michael Dale merged e15bb75 13c41aa
Michael Dale Merge branch 'develop' into newResourceLoader
Conflicts:
	modules/EmbedPlayer/resources/mw.EmbedTypes.js
	mwEmbed.js
ed4098f
Michael Dale change default NotPlayableDownloadLink to true 39b7d50
Michael Dale display image thumbnail for link player ( not the video tag poster ) 3e4f8b8
Michael Dale use HTML image poster for direct download links 02f8f70
Michael Dale make sure the video player is visible at updatePosterHTML time b25b7bb
@avivais avivais Added mw.getHexColor utility function to convert color code from HEX
notation to HTML
8d0fa3c
@avivais avivais Merge branch 'newResourceLoader' of https://github.com/kaltura/mwEmbed
…into newResourceLoader
0022391
@mdale

note; mw.getHexColor is used in kTimedText and playerControlBuilder

@KalturaGitBot

Live Pull Request Urls

@KalturaGitBot

Live Pull Request Urls

@KalturaGitBot

Live Pull Request Urls

@KalturaGitBot

Updated pull request 64: 27b6e9e

@KalturaGitBot

Live Pull Request Urls

avivais added some commits Jul 4, 2012
@avivais avivais Added KalturaSupport locale reference
Removed unnecessary padding from overlay
d31e083
@avivais avivais Added more messages to KalturaSupport locale
Added support for setting and displaying error title
86646df
@mdale

As presently written it has a odd conditional that if the given string is in the 'strings' uiVars then the title is pulled from there, else we do the fallback localized version. Also your generic message error is never reached. And your generic message error should be localized, and you change the functionality of getKalturaMsg, to return an object instead of a string, the method name should be updated.

I would suggest adding an additional method like "getKalturaErrorMsgSet" for both TITLE and message set object.. then you call getKalturaMsg in that method instead of having the _this.getPluginConfig( embedPlayer, 'strings', msgKey ) logic repeated inside the , getKalturaMsg function. and your getKalturaErrorMsgSet method you have something simple like:

getKalturaErrorMsgSet: function(){
    return {
        'title':  embedPlayer.getKalturaMsg(msgKey + '_TITLE')
        'message' : embedPlayer.getKalturaMsg(msgKey)
    }
}

If you want to use generic message keys; you should instead check for the existence of the key something like:

if( !new mw.Message( msgKey ).exists() ) {
    // use generic localized msgKey
}

if you ~only~ want to use generic fallback for the title, maybe further break down into more sub methods so you can run that check where you need to.

@mdale

to make it clear whats going on .. we should change methods to getMsgObject

@mdale

you can be a bit more concise using a $.extend ( if alerts are a super set of errorObjects ) i.e

var alertObj = $.extend( errorObj, { 'isModal': true, 'keepOverlay':true })
@mdale

its not good practice when re-factoring to add a new required variable; for example you may not have added this to everywhere this['data-playerError'] is set, and this would prevent that error from being shown.

perhaps supporting modals with empty titles?

@mdale

This refactor can clean up the internal storage of the error msg. ... and just store it as a local object. ... we can do away with the data-playerError attribute, since it was only designed to allow imports of errors from the base embed.

We can instead early on when we are parsing the video tag attributes, simply call setError then and do away with internal storage of data-playerError

Could you clarify that? We need to store the error object... Calling setError while parsing the video tag would lead to the same result as now

I just mean the storage location "data-playerError" is not a normal internal variable it has the hyphen and 'data-' prefix. ... i.e something like:
https://github.com/kaltura/mwEmbed/blob/develop/modules/EmbedPlayer/mw.EmbedPlayer.js#L170 but calling setError instead of directly assigning the value.

@mdale

if in the end your going to return an object create that object early on. And remember to localize generic errors.

i.e var msgObj = { 'message': false, 'title': gM( 'ks-genneric-error-has-occured') };

then update that msgObj in the method... then you can cleanly return the object instead of repeating the variables as keys in the final object return.

@avivais avivais Followup to 86646df
* Seperated getters for error message body and title
* Added a generic error message fallback
ca5e707
ranyefet and others added some commits Jul 5, 2012
@ranyefet ranyefet Merge layoutRefactor with newResourceLoader d731160
Michael Dale Merge branch 'develop' into newResourceLoader
Conflicts:
	includes/DefaultSettings.php
	kWidget/kWidget.js
	modules/AdSupport/resources/mw.AdLoader.js
	modules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
	modules/KalturaSupport/download.php
	modules/KalturaSupport/kalturaIframe.php
	modules/KalturaSupport/loader.js
	modules/KalturaSupport/resources/mw.KWidgetSupport.js
	modules/KalturaSupport/tests/EmbedFlashembed.qunit.html
	modules/KalturaSupport/tests/kWidget.embed.qunit.html
	modules/KalturaSupport/uiConfComponents/faderPlugin.js
	modules/TimedText/resources/mw.TimedText.js
	resources/mediawiki/mediawiki.ajaxProxy.js
723bb96
@KalturaGitBot

Live Pull Request Urls

@KalturaGitBot

Updated pull request 64: 723bb96

@KalturaGitBot

Updated pull request 64: 723bb96

@mdale

minor note: I don't see why we need both err and msgObj var here... cant we just say errorMsg = null; at the start and if there is an error its populated, best to avoid flags if you have a way to directly represent the condition.

That's because I start with errorMsg = GENERIC_ERROR message

@mdale

@avivais I noticed the alerts has a "ok" button ...We should maybe have an error mode that does not let you press "ok" to hide the error if doing so provides no benefit? I see the KDP does this as well, but its kind of a ui defect ... since pressing ok does not give you any additional recourse.

Also we may want to work on better centring of the error message right now its showing up 10px from the top for me. maybe use css centring: http://jsfiddle.net/mktEL/4/

And the fonts don't seem to be the same as the kdp maybe too small ? And finally may want to have fun with css gradients / shadows to make it pop out a bit more, and do some rounding on the ok button. ...

( most of the style stuff is optional.. just the centring is required )

Also be sure to fix the automated tests like "/modules/KalturaSupport/tests/CustomMessageAccessControlKS.html"

Do we want to differ from the KDP? If so, I can add this feature of no buttons.

Yes lets add it in as a feature. I don't like the click ok and the dialogue disappears and you can do nothing UI.

ranyefet and others added some commits Jul 5, 2012
@ranyefet ranyefet remove syncPlayerSize calls 870d485
Michael Dale replace $j with $ added function wrap to vastAdParser c435e86
Michael Dale fixes for vast ad parser use strict ba1d8f6
@ranyefet ranyefet added check for orginalParentIframeLayout exists 78f26cb
Michael Dale grab the correct document target to check for fullscreen 47546f8
Michael Dale fixed timed text automated test
--work remains for below video captions, best done in the context of the
layout refactor
4ace47e
Michael Dale adjusted sequencing for kBind kUnbind test
-- fixed global callback name stacking callback bug in kBind
-- test is passing for html5
3b73cc5
Michael Dale fixed text match in TTML test 4ef2ba2
@KalturaGitBot

Updated pull request 64: 4ef2ba2

Michael Dale Captions Custom Vars test file restored text check
-- possible text mismatch
6b4e78a
@KalturaGitBot

Updated pull request 64: 6b4e78a

@KalturaGitBot

Updated pull request 64: 441eeb1

@KalturaGitBot

Live Pull Request Urls

@KalturaGitBot

Updated pull request 64: 9e9d3cf

@KalturaGitBot

Updated pull request 64: e4b9c3c

@KalturaGitBot

Live Pull Request Urls

@KalturaGitBot

Updated pull request 64: 5d8e432

@mdale

I understand the default hide of optionsMenu.. but what does the optionsMenu uiConf xml refer to in flash? Are we now not reflecting that in HTMl5 ?

p.s can we make OptionsMenu into a qunit test ;)

optionsMenu does not reflect anything in flash. it was invented for html5 player only.

Michael Dale Merge branch 'develop' into newResourceLoader
Conflicts:
	LocalSettings.php.sample
	includes/DefaultSettings.php
	kWidget/kWidget.js
	modules/AdSupport/resources/mw.AdTimeline.js
	modules/DolStatistics/resources/mw.DolStatistics.js
	modules/DoubleClick/resources/mw.DoubleClick.js
	modules/EmbedPlayer/mw.EmbedPlayer.js
	modules/EmbedPlayer/mw.IFramePlayerApiServer.js
	modules/EmbedPlayer/resources/mw.EmbedPlayerNative.js
	modules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
	modules/KalturaSupport/KalturaResultObject.php
	modules/KalturaSupport/kalturaIframe.php
	modules/KalturaSupport/resources/mw.KDPMapping.js
	modules/KalturaSupport/resources/mw.PlaylistHandlerKaltura.js
	modules/KalturaSupport/resources/uiConfComponents/shareSnippet.js
	modules/KalturaSupport/uiConfComponents/controlbarLayout.js
	modules/KalturaSupport/uiConfComponents/watermarkPlugin.js
	modules/Omniture/loader.js
	modules/Omniture/resources/mw.Omniture.js
	modules/Omniture/tests/OmniturePlayer.html
	modules/TimedText/resources/mw.TimedText.js
	mwEmbed.js
f66c3b9
@KalturaGitBot

Updated pull request 64: f66c3b9

Michael Dale added some commits Aug 9, 2012
Michael Dale some playlist code clean up,
attempts to restore playlist support in multi player mode ( not 100%
working yet )
e329e12
Michael Dale fixed basic playlist layout issues 2ad63d4
Michael Dale set horizontal progress bar to relative position 9e5670f
Michael Dale css fixes, re-build controls on updateInterface ( for RWD controls ) e26b929
Michael Dale working ResizablePlayer most playlist issues of #206 addressed.
-- note the resize uses a updateInterfaceSize which is not as ideal as
fully css based layout. But at least it "works" for now. A full css
based layout can be a future goal.
c786cd4
Michael Dale removed control bar updates at small player size, was causing issues
can be revisited in the future
7d6d960
Michael Dale fix for access control messages in playlists taking up full interface c78f7b3
Michael Dale fixed broken merge 3687f29
Michael Dale fixed more broken merge issues 3d148bf
Michael Dale Some double click fixes & Merge branch 'develop' into newResourceLoader
Conflicts:
	modules/KalturaSupport/resources/mw.KWidgetSupport.js
836bb90
Michael Dale removed debugger; call 4cdf9e9
Michael Dale ad timeline fixes for missing restore calls c7a344c
Michael Dale remove double negative in ad timeline restore player trigger ee74f4b
@KalturaGitBot

Updated pull request 64: ee74f4b

@KalturaGitBot

Updated pull request 64: ecc16d8

@KalturaGitBot

Updated pull request 64: d2bec7f

mdale fixed missing isLocalDomain url function, fixed #179 loading issue
-- rss playlists in general remain broken
1477317
@KalturaGitBot

Updated pull request 64: 1477317

@KalturaGitBot

Updated pull request 64: 48b6192

@KalturaGitBot

Updated pull request 64: 212a850

@KalturaGitBot

Updated pull request 64: 4be4103

@KalturaGitBot

Updated pull request 64: e0420de

Michael Dale Merge branch 'develop' into newResourceLoader
Conflicts:
	modules/DoubleClick/resources/mw.DoubleClick.js
	modules/EmbedPlayer/mw.EmbedPlayer.js
	modules/EmbedPlayer/resources/mw.EmbedPlayerNative.js
	modules/EmbedPlayer/resources/mw.EmbedTypes.js
	modules/EmbedPlayer/resources/skins/mw.PlayerControlBuilder.js
	modules/KalturaSupport/KalturaResultObject.php
	modules/KalturaSupport/kalturaIframe.php
	mwEmbed.js
54bf4cf
@KalturaGitBot

Updated pull request 64: 54bf4cf

@KalturaGitBot

Updated pull request 64: 600c582

@KalturaGitBot

Updated pull request 64: 1e952db

Michael Dale added some commits Aug 14, 2012
Michael Dale fixed autoplay mwEmbed path 7b34c8f
Michael Dale Added event 'KalturaSupportNewPlayer'
-- avoid out of order execution before uiConf is ready
1a1bba2
Michael Dale fixed ad overlay possibly related to #210 8d28ba3
@KalturaGitBot

Updated pull request 64: 8d28ba3

@KalturaGitBot

Updated pull request 64: ba501ce

@mdale

I meant issue #198 is closed per this update.

@ranyefet

Why do we need iframe cache?

because it reduces the number of requests and improves player display time.

@KalturaGitBot

Updated pull request 64: ea955cf

@KalturaGitBot

Updated pull request 64: 6450d54

Michael Dale added some commits Aug 15, 2012
Michael Dale fixed ks error array type mapping 0bf8d94
Michael Dale added some legacy plugin support functions 0ce1fea
Michael Dale fixed custom jquery ui skin support 494a4df
Michael Dale * removed deprecated sync player size
* add custom skin at SetupInterface time
* getKalturaThumbnailUrl uses black pixel if missing thumb url
* fixed playlist multiple init race condition
42f9268
Michael Dale fix for #182 use ignoreNextNative event in onpause as well. 103d2b2
Michael Dale fixed changeMedia test to actually test changeMedia event b6ed75b
@KalturaGitBot

Updated pull request 64: b6ed75b

@KalturaGitBot

Updated pull request 64: bae214d

@KalturaGitBot

Updated pull request 64: d492214

@KalturaGitBot

Updated pull request 64: 596e049

@KalturaGitBot

Updated pull request 64: cf49ece

Michael Dale added some commits Aug 19, 2012
Michael Dale Merge branch 'newResourceLoader' of git@github.com:kaltura/mwEmbed.gi…
…t into newResourceLoader

Conflicts:
	modules/KalturaSupport/tests/BumperVideoNoAdd.html
884e306
Michael Dale removed debugger line 937c934
@KalturaGitBot

Updated pull request 64: 937c934

Michael Dale Merge branch 'develop' into newResourceLoader
Note: TimedText seems to still be a bit broken

Conflicts:
	includes/DefaultSettings.php
	modules/EmbedPlayer/resources/mw.EmbedPlayerNative.js
	modules/KalturaSupport/KalturaResultObject.php
	modules/KalturaSupport/resources/mw.KAds.js
	modules/KalturaSupport/resources/mw.KDPMapping.js
	modules/KalturaSupport/resources/mw.KTimedText.js
	modules/TimedText/resources/mw.TimedText.js
475b5f8
@KalturaGitBot

Updated pull request 64: 475b5f8

@KalturaGitBot

Updated pull request 64: 64c424c

@KalturaGitBot

Updated pull request 64: a82cfce

@KalturaGitBot

Updated pull request 64: 7362081

@mdale mdale merged commit d462625 into develop Aug 20, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment