Browse Source

Add bower.json, remove assets calls in composer.json

jmontoya 9 years ago
parent
commit
2f290e9e6f
4 changed files with 36 additions and 30 deletions
  1. 1 0
      .bowerrc
  2. 1 29
      composer.json
  3. 1 1
      main/inc/lib/template.lib.php
  4. 33 0
      src/Chamilo/CoreBundle/Resources/config/bower.json

+ 1 - 0
.bowerrc

@@ -0,0 +1 @@
+{ "directory": "app/Resources/public/assets" }

+ 1 - 29
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"
-            }
-        ]
+        }
     }
 }

+ 1 - 1
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'
         ];
 

+ 33 - 0
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"
+  }
+}