# HG changeset patch # User cavaliet # Date 1382971270 -3600 # Node ID 91d9d71b30737116c29ab4446a4ff1cfa3d193ec # Parent a1c981ff32ac84c68547147ac089a5904672a6fe enhance load and tagcloud diff -r a1c981ff32ac -r 91d9d71b3073 web/index.html --- a/web/index.html Mon Oct 28 15:02:14 2013 +0100 +++ b/web/index.html Mon Oct 28 15:41:10 2013 +0100 @@ -365,8 +365,24 @@ }); $(document).mouseup(mouseup_userguide); + // load first video with get parameter + var video_start = false; + var iframe = getURLParameter("iframe"); + if(iframe=="null"){ + var v = getURLParameter("v"); + if(!(v=="null")){ + video_start = true; + playVideo(v, "", false); + } + } + else{ + video_start = true; + displayIframe(iframe, false); + } // load : display tables de matières and text - $("#titles").slideDown(); + if(!video_start){ + $("#titles").slideDown(); + } }); diff -r a1c981ff32ac -r 91d9d71b3073 web/lib/metadataplayer/Tagcloud.js --- a/web/lib/metadataplayer/Tagcloud.js Mon Oct 28 15:02:14 2013 +0100 +++ b/web/lib/metadataplayer/Tagcloud.js Mon Oct 28 15:41:10 2013 +0100 @@ -72,12 +72,13 @@ + (_this.include_descriptions ? _annotation.description : '') + ' ' + (_this.include_tag_texts ? _annotation.getTagTexts() : ''); - IriSP._(_txt.toLowerCase().replace(_urlRegExp, '').match(_regexpword)).each(function(_word) { + IriSP._(_txt.split(',')).each(function(_word) { if (IriSP._(_this.stopwords).indexOf(_word) == -1 && (!_this.exclude_pattern || !_this.exclude_pattern.test(_word))) { _words[_word] = 1 + (_words[_word] || 0); } }); }); + _words = IriSP._(_words) .chain() .map(function(_v, _k) {