# HG changeset patch # User Edwin Razafimahatratra # Date 1358531453 -3600 # Node ID eeb0a6f3c07d732155199051819acaf810f9798c # Parent b3188fe3729a309e10a10a2e2a00e7efa35941ba resync diff -r b3188fe3729a -r eeb0a6f3c07d web/int_fiction.html --- a/web/int_fiction.html Fri Jan 18 17:57:30 2013 +0100 +++ b/web/int_fiction.html Fri Jan 18 18:50:53 2013 +0100 @@ -2,11 +2,11 @@ - The End niv1- @todo + The End - @todo - + -
- - -
-
- - -
- -
- -
- + +
+
+
- - -
- -
-
- - - - -
- -
- - -
- -
    - -
  • 0'00''
    • -
  • 0'00''
    • -
- -
- - - - - - - - -
-
- -
- - diff -r b3188fe3729a -r eeb0a6f3c07d web/partage.html --- a/web/partage.html Fri Jan 18 17:57:30 2013 +0100 +++ b/web/partage.html Fri Jan 18 18:50:53 2013 +0100 @@ -72,11 +72,16 @@ + + diff -r b3188fe3729a -r eeb0a6f3c07d web/static/res/js/incchoice.js --- a/web/static/res/js/incchoice.js Fri Jan 18 17:57:30 2013 +0100 +++ b/web/static/res/js/incchoice.js Fri Jan 18 18:50:53 2013 +0100 @@ -262,7 +262,44 @@ return 0; } return time; - }; + }; + + //---------------------------------------------------------------------------------------------------------------------------- + // Url share + //---------------------------------------------------------------------------------------------------------------------------- + + this.createShareUrl = function(index1, index2, index3) + { + var index = this.getChoosenWords(); + var param = ((index[0] << 16) | (index[1] << 8) | index[2]) << 4; + var urlBase = document.URL; + var url = urlBase + "?" + param; + return url; + } + + this.readUrlVideosIndex = function() + { + var query = window.location.search.substring(1); + if (query.length < 0) { + return; + } + + var number = parseInt(query); + + number >>= 4; + var index3 = number & 255; + number >>= 8; + var index2 = number & 255; + number >>= 8; + var index1 = number & 255; + + var maxVideoIndex = this.allSequencesData.videos.length - 1; + if (index1 > maxVideoIndex || index2 > maxVideoIndex || index3 > maxVideoIndex) { + return []; + } + + return [index1, index2, index3]; + }; //---------------------------------------------------------------------------------------------------------------------------- // Cookies tools diff -r b3188fe3729a -r eeb0a6f3c07d web/static/res/js/incplayer.js --- a/web/static/res/js/incplayer.js Fri Jan 18 17:57:30 2013 +0100 +++ b/web/static/res/js/incplayer.js Fri Jan 18 18:50:53 2013 +0100 @@ -48,8 +48,6 @@ this.nextPage = nextPage; this.videoDivId = videoDivId; - this.readUrlVideosIndex(); - // Control this.playButton = $("#" + playButtonId).get(0); this.hdSdButton = $("#" + hdSdButtonId).get(0); @@ -187,7 +185,7 @@ } // Extention - v.src += "." + this.videoExt; + v.src += "." + /*this.videoExt*/ "mp4"; // TODO // Set the final file this.sequences[i] = v; @@ -826,25 +824,6 @@ } return ""; }; - - this.createUrlVideosIndex = function(index1, index2, index3) - { - return ((index1 << 16) | (index2 << 8) | index3) << 4; - } - - this.readUrlVideosIndex = function() - { - var query = window.location.search.substring(1); - if (query.length < 0) { - return; - } - - var number = parseInt(query); - number = this.createUrlVideosIndex(20, 30, 44); - - console.log("query: " + number); - console.log(n); - }; } var incPlayer = new IncPlayer(); diff -r b3188fe3729a -r eeb0a6f3c07d web/transition.html --- a/web/transition.html Fri Jan 18 17:57:30 2013 +0100 +++ b/web/transition.html Fri Jan 18 18:50:53 2013 +0100 @@ -54,7 +54,7 @@

Partagez

Recommencez

The end, etc.

-

Prolongez l'expérience

+

Prolongez l'expérience

Crédits