Merge pull request #519 from LaurentGoderre/v3.0

Renamed the bin folder because it is reserved for libraries in IIS
wet-boew · Oct 4, 2012 · 87c0098 · 87c0098
2 parents 2540fca + 82e8665
commit 87c0098
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/build/js/bin/multimedia.swf → build/js/binary/multimedia.swf b/build/js/bin/multimedia.swf → build/js/binary/multimedia.swf
diff --git a/build/js/pe-ap-min.js b/build/js/pe-ap-min.js
diff --git a/src/js/bin/multimedia.swf → src/js/binary/multimedia.swf b/src/js/bin/multimedia.swf → src/js/binary/multimedia.swf
diff --git a/src/js/build.xml b/src/js/build.xml
@@ -27,7 +27,7 @@
 			<resources>
 				<fileset dir="${src.dir}">
 					<include name="images/**"/>
-					<include name="bin/**"/>
+					<include name="binary/**"/>
 					<include name="jquerymobile/*.min.js"/>
 					<include name="*.js"/>
 					<exclude name="pe-ap.js"/> 

diff --git a/src/js/workers/multimedia.js b/src/js/workers/multimedia.js
@@ -55,7 +55,7 @@
 				poster,
 				fbVideoType = 'video/mp4',
 				fbAudioType = 'audio/mp3', //MP3
-				fbBin = _pe.add.liblocation + 'bin/multimedia.swf?seed=' + Math.random(),
+				fbBin = _pe.add.liblocation + 'binary/multimedia.swf?seed=' + Math.random(),
 				fbVars,
 				evtmgr;