From 89b57730b58450c963ce08a414faa3e1c70a7be0 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Tue, 13 Aug 2013 02:18:59 +0200
Subject: [PATCH] Add swfobject

---
 Gruntfile.js                      | 6 ++++++
 bower.json                        | 3 ++-
 lib/conf.d/minifyGroupsConfig.php | 8 ++++----
 templates/web/overview.html.twig  | 2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index fb10464712..120410db2d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -211,6 +211,12 @@ module.exports = function(grunt) {
                 "dest": "www/assets/requirejs/",
                 "flatten": true
             },
+            "swfobject": {
+                "expand": true,
+                "src": "assets/swfobject/swfobject/swfobject.js",
+                "dest": "www/assets/swfobject",
+                "flatten": true
+            },
             "underscore": {
                 "expand": true,
                 "src": [
diff --git a/bower.json b/bower.json
index f348d3496b..28d8047a68 100644
--- a/bower.json
+++ b/bower.json
@@ -23,6 +23,7 @@
     "js-fixtures": "https://github.com/badunk/js-fixtures/archive/master.zip",
     "bootstrap-multiselect": "https://github.com/davidstutz/bootstrap-multiselect.git",
     "zxcvbn" : "https://github.com/lowe/zxcvbn.git",
-    "geonames-server-jquery-plugin" : "~0.2"
+    "geonames-server-jquery-plugin" : "~0.2",
+    "swfobject" : "latest"
   }
 }
diff --git a/lib/conf.d/minifyGroupsConfig.php b/lib/conf.d/minifyGroupsConfig.php
index 4d8f7f0b27..8687464eeb 100644
--- a/lib/conf.d/minifyGroupsConfig.php
+++ b/lib/conf.d/minifyGroupsConfig.php
@@ -21,7 +21,7 @@ $groups = array(
         '//scripts/apps/login/home/config.js'
     ),
     'client' => array(
-        '//include/jslibs/swfobject/swfobject.js'
+        '//assets/swfobject/swfobject.js'
         , '//assets/jquery.ui/i18n/jquery-ui-i18n.js'
         , '//include/jslibs/jquery.cookie.js'
         , '//include/jquery.common.js'
@@ -66,7 +66,7 @@ $groups = array(
          '//assets/jquery.ui/i18n/jquery-ui-i18n.js'
     ),
     'prod' => array(
-        '//include/jslibs/swfobject/swfobject.js'
+        '//assets/swfobject/swfobject.js'
         , '//assets/underscore-amd/underscore.js'
         , '//include/jslibs/json2.js'
         , '//include/jslibs/colorpicker/js/colorpicker.js'
@@ -117,7 +117,7 @@ $groups = array(
     'lightbox' => array(
          '//include/jslibs/jquery.mousewheel.js'
         , '//include/jquery.tooltip.js'
-        , '//include/jslibs/swfobject/swfobject.js'
+        , '//assets/swfobject/swfobject.js'
         , '//assets/jquery.ui/i18n/jquery-ui-i18n.js'
         , '//include/jslibs/jquery.cookie.js'
         , '//include/jslibs/jquery.contextmenu_scroll.js'
@@ -129,7 +129,7 @@ $groups = array(
     'lightboxie6' => array(
          '//include/jslibs/jquery.mousewheel.js'
         , '//include/jquery.tooltip.js'
-        , '//include/jslibs/swfobject/swfobject.js'
+        , '//assets/swfobject/swfobject.js'
         , '//assets/jquery.ui/i18n/jquery-ui-i18n.js'
         , '//include/jslibs/jquery.cookie.js'
         , '//include/jslibs/jquery.contextmenu_scroll.js'
diff --git a/templates/web/overview.html.twig b/templates/web/overview.html.twig
index 474fa885c9..91737c455b 100644
--- a/templates/web/overview.html.twig
+++ b/templates/web/overview.html.twig
@@ -60,7 +60,7 @@
         </style>
 {% endblock %}
 {% block javascript %}
-        <script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js,include/jslibs/jquery.mousewheel.js,include/jquery.image_enhancer.js,include/jslibs/swfobject/swfobject.js' }) }}"></script>
+        <script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery/jquery.js,include/jslibs/jquery.mousewheel.js,include/jquery.image_enhancer.js,assets/swfobject/swfobject.js' }) }}"></script>
     <script type="text/javascript" src="{{ path('minifier', { 'f' : 'assets/jquery.ui/jquery-ui.js' }) }}"></script>
         <script type="text/javascript" src="/include/jslibs/flowplayer/flowplayer-3.2.11.min.js"></script>
     <script type="text/javascript">