equal
deleted
inserted
replaced
136 } else if (videosIndex.length == 3) { |
136 } else if (videosIndex.length == 3) { |
137 // The player got reloded, we use the previously choosen videos |
137 // The player got reloded, we use the previously choosen videos |
138 for (var i = 0; i < videosIndex.length; ++i) { |
138 for (var i = 0; i < videosIndex.length; ++i) { |
139 this.sequences.push(this.allSequencesData.videos[videosIndex[i]]); |
139 this.sequences.push(this.allSequencesData.videos[videosIndex[i]]); |
140 } |
140 } |
|
141 } else if (wordsIndex[0] == null) { |
|
142 // No reason to be here, redirection |
|
143 location.href = "index.html"; |
|
144 |
141 } else { |
145 } else { |
142 // We choose new videos |
146 // We choose new videos |
143 |
147 |
144 // Get previous used videos |
148 // Get previous used videos |
145 var var32bits = incChoice.getChoosenVideosFlags(); |
149 var var32bits = incChoice.getChoosenVideosFlags(); |
762 }; |
766 }; |
763 |
767 |
764 this.loadJson = function(jsonFile) |
768 this.loadJson = function(jsonFile) |
765 { |
769 { |
766 var txt = this.loadTxtFile(jsonFile); |
770 var txt = this.loadTxtFile(jsonFile); |
767 return JSON.parse(txt); |
771 var obj = null; |
|
772 |
|
773 $.ajax({ |
|
774 url: jsonFile, |
|
775 async: false, |
|
776 success: function (data){ |
|
777 obj = data; |
|
778 } |
|
779 }); |
|
780 |
|
781 return obj; |
768 }; |
782 }; |
769 |
783 |
770 this.loadTxtFile = function(jsonFile) |
784 this.loadTxtFile = function(jsonFile) |
771 { |
785 { |
772 var xhr = new XMLHttpRequest(); |
786 var xhr = new XMLHttpRequest(); |
773 xhr.open("GET", jsonFile, false); |
787 xhr.open("GET", jsonFile, false); |
774 xhr.overrideMimeType('text/plain; charset=x-user-defined'); |
788 if (xhr.overrideMimeType) { |
|
789 xhr.overrideMimeType('text/plain; charset=x-user-defined'); |
|
790 } |
775 |
791 |
776 try { |
792 try { |
777 xhr.send(null); |
793 xhr.send(null); |
778 } catch(e) { |
794 } catch(e) { |
779 return ""; |
795 return ""; |