From 2f290e9e6ff0e1c27d59746f3bc75bf97820742c Mon Sep 17 00:00:00 2001
From: jmontoya <gugli100@gmail.com>
Date: Fri, 26 Feb 2016 15:05:25 +0100
Subject: [PATCH] Add bower.json, remove assets calls in composer.json

---
 .bowerrc                                      |  1 +
 composer.json                                 | 30 +----------------
 main/inc/lib/template.lib.php                 |  2 +-
 .../CoreBundle/Resources/config/bower.json    | 33 +++++++++++++++++++
 4 files changed, 36 insertions(+), 30 deletions(-)
 create mode 100644 .bowerrc
 create mode 100644 src/Chamilo/CoreBundle/Resources/config/bower.json

diff --git a/.bowerrc b/.bowerrc
new file mode 100644
index 0000000000..ab67325340
--- /dev/null
+++ b/.bowerrc
@@ -0,0 +1 @@
+{ "directory": "app/Resources/public/assets" }
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 713a196b08..a790ce241d 100755
--- a/composer.json
+++ b/composer.json
@@ -65,24 +65,6 @@
         "ddeboer/data-import": "@stable",
         "phpoffice/phpexcel": "~1.8",
         "webit/eval-math": "dev-master",
-        "fxp/composer-asset-plugin": "~1.0",
-        "bower-asset/fontawesome": "4.4.*",
-        "bower-asset/jquery": "2.2.0",
-        "bower-asset/jquery-ui": "1.11.*",
-        "bower-asset/bootstrap-daterangepicker": "1.3.*",
-        "bower-asset/ckeditor": "4.*",
-        "bower-asset/jquery-timeago": "1.4.*",
-        "bower-asset/mediaelement": "2.*",
-        "bower-asset/modernizr": "2.8.*",
-        "bower-asset/jqueryui-timepicker-addon": "1.5.*",
-        "bower-asset/imageMap-resizer": "0.5.*",
-        "bower-asset/fullcalendar": "2.3.2",
-        "bower-asset/simplewebrtc": "1.15.*",
-        "bower-asset/select2": "4.*",
-        "bower-asset/MathJax": "2.5.*",
-        "bower-asset/webcamjs": "1.0.*",
-        "bower-asset/cropper": "1.0.*",
-        "bower-asset/jquery.scrollbar": "0.2.*",
         "clue/graph": "~0.9.0",
         "graphp/graphviz": "~0.2.0",
         "graphp/algorithms": "~0.8.0",
@@ -117,16 +99,6 @@
     "extra": {
         "branch-alias": {
             "dev-master": "1.10.x-dev"
-        },
-        "asset-installer-paths": {
-            "bower-asset-library": "web/assets/"
-        },
-        "asset-repositories": [
-            {
-                "type": "bower-vcs",
-                "url": "https://github.com/twbs/bootstrap.git",
-                "name": "bower-asset/bootstrap"
-            }
-        ]
+        }
     }
 }
diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php
index 38c2b3239e..0bd0c2f65c 100755
--- a/main/inc/lib/template.lib.php
+++ b/main/inc/lib/template.lib.php
@@ -675,7 +675,7 @@ class Template
             'jquery-timeago/jquery.timeago.js',
             'mediaelement/build/mediaelement-and-player.min.js',
             'jqueryui-timepicker-addon/dist/jquery-ui-timepicker-addon.min.js',
-            'imagemap-resizer/js/imageMapResizer.min.js',
+            'image-map-resizer/js/imageMapResizer.min.js',
             'jquery.scrollbar/jquery.scrollbar.min.js'
         ];
 
diff --git a/src/Chamilo/CoreBundle/Resources/config/bower.json b/src/Chamilo/CoreBundle/Resources/config/bower.json
new file mode 100644
index 0000000000..21d1b8ea20
--- /dev/null
+++ b/src/Chamilo/CoreBundle/Resources/config/bower.json
@@ -0,0 +1,33 @@
+{
+  "name": "ChamiloLMS",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "bootstrap": "3.*",
+    "fontawesome": "4.4.*",
+    "jquery": "2.2.0",
+    "jquery-ui": "1.11.*",
+    "bootstrap-daterangepicker": "1.3.*",
+    "ckeditor": "4.*",
+    "jquery-timeago": "1.4.*",
+    "mediaelement": "2.*",
+    "modernizr": "2.8.*",
+    "jqueryui-timepicker-addon": "1.5.*",
+    "image-map-resizer": "0.5.*",
+    "fullcalendar": "2.3.2",
+    "simpleWebRTC": "1.15.*",
+    "select2": "4.*",
+    "MathJax": "2.5.*",
+    "webcamjs": "1.0.*",
+    "cropper": "1.0.*",
+    "jquery.scrollbar": "0.2.*"
+  },
+  "resolutions": {
+    "jquery": "2.1.4"
+  }
+}