Merge branch 'feature/removing-swfobject'

mmkmou · Jan 30, 2012 · 69088f3 · 69088f3
2 parents 234f7ac + 4e6c5bc
commit 69088f3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+* Replaced swfobject with custom embed to save file size.
 * Added  flash iframe-mode, an experimental method for getting around flash reloading issues.
 * Fixed issue with volume knob position. Improved controls fading.
 * Fixed ian issue with triggering fullscreen a second time.

diff --git a/Rakefile b/Rakefile
@@ -72,7 +72,7 @@ namespace :build do
       combined << File.read("src/#{item}")
     end
 
-    combined << File.read("flash/swfobject.js")
+    # combined << File.read("flash/swfobject.js")
     combined << File.read("src/setup.js")
     combined << File.read("src/_end.js")
 
@@ -112,7 +112,7 @@ namespace :build do
       file.puts "var vjsSourceList = [];"
 
       src_array = ["src/core", "src/lib"]
-      last = ["flash/swfobject", "src/setup"]
+      last = ["src/setup"] # "flash/swfobject", 
       exclude = [".", "..", ".DS_Store", "_end.js", "_begin.js"]
 
       Dir.foreach('src') do |item|

diff --git a/build.sh b/build.sh
@@ -29,7 +29,7 @@ cat src/controls.js >> dist/video.js
 cat src/tracks.js >> dist/video.js
 
 # h5swf temporarily requires swfobject
-cat flash/swfobject.js >> dist/video.js
+# cat flash/swfobject.js >> dist/video.js
 
 cat src/setup.js >> dist/video.js
 cat src/_end.js >> dist/video.js

diff --git a/dev.html.example b/dev.html.example
@@ -21,8 +21,6 @@
   <script src="src/controls.js"></script>
   <script src="src/events.js"></script>
   <script src="src/tracks.js"></script>
-
-  <script src="flash/swfobject.js"></script>
 
   <script src="src/setup.js"></script>