hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

migrate backbone and underscore to npm and refactored test modules

Browse Source
This commit is contained in:
Mike Ng
2018-01-19 15:03:00 +04:00
parent 802c52d7ff
commit 374f8eaff4
13 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/gulp/components/admin.js
View File

@@ -15,7 +15,7 @@ gulp.task('build-admin-css', function(){
gulp.task('build-admin-js', function(){
var adminGroup = [
config.paths.vendors + 'underscore-amd/underscore.js',
config.paths.nodes + 'underscore/underscore.js',
config.paths.nodes + 'jquery-treeview/jquery.treeview.js',
// config.paths.vendors + 'jquery-file-upload/js/vendor/jquery.ui.widget.js',
// config.paths.vendors + 'jquery-file-upload/js/jquery.iframe-transport.js',

4
resources/gulp/components/vendors/backbone.js vendored
View File

@@ -7,11 +7,11 @@ var utils = require('../../utils.js');
gulp.task('build-underscore', function(){
return utils.buildJsGroup([
config.paths.vendors + 'underscore-amd/underscore.js'
config.paths.nodes + 'underscore/underscore.js'
], 'underscore', 'vendors/underscore');
});
gulp.task('build-backbone', ['build-underscore'], function(){
return utils.buildJsGroup([
config.paths.vendors + 'backbone-amd/backbone.js'
config.paths.nodes + 'backbone/backbone.js'
], 'backbone', 'vendors/backbone');
});

4
resources/www/prod/js/tests/jquery.Edit.js.html
View File

@@ -4,9 +4,9 @@
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script src="../../../../../www/assets/vendors/jquery/jquery.js"></script>
<script src="../../../../../www/bower_components/qunit/qunit/qunit.js"></script>
<script src="../../../../../node_modules/qunitjs/qunit/qunit/qunit.js"></script>
<script src="../jquery.Edit.js"></script>
<link type="text/css" rel="stylesheet" href="../../../../../www/bower_components/qunit/qunit/qunit.css"/>
<link type="text/css" rel="stylesheet" href="../../../../../node_modules/qunitjs/qunit/qunit.css"/>
<script> $(document).ready(function(){
// disable log messages in tests

4
resources/www/prod/js/tests/jquery.Selection.js.html
View File

@@ -4,9 +4,9 @@
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script src="../../../../../www/assets/vendors/jquery/jquery.js"></script>
<script src="../../../../../www/bower_components/qunit/qunit/qunit.js"></script>
<script src="../../../../../node_modules/qunitjs/qunit/qunit.js"></script>
<script src="../jquery.Selection.js"></script>
<link type="text/css" rel="stylesheet" href="../../../../../www/bower_components/qunit/qunit/qunit.css"/>
<link type="text/css" rel="stylesheet" href="../../../../../node_modules/qunitjs/qunit/qunit.css"/>
<script> $(document).ready(function(){

4
resources/www/prod/js/tests/jquery.Upload.js.html
View File

@@ -5,10 +5,10 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script src="../../../../../www/assets/vendors/jquery/jquery.js"></script>
<script src="../../../../../www/assets/vendors/jquery-ui/jquery-ui.js"></script>
<script src="../../../../../www/bower_components/qunit/qunit/qunit.js"></script>
<script src="../../../../../node_modules/qunitjs/qunit/qunit.js"></script>
<script src="../../../../../www/assets/vendors/blueimp-load-image/load-image.js"></script>
<script src="../components/upload/jquery.Upload.js"></script>
<link type="text/css" rel="stylesheet" href="../../../../../www/bower_components/qunit/qunit/qunit.css"/>
<link type="text/css" rel="stylesheet" href="../../../../../node_modules/qunitjs/qunit/qunit.css"/>
<script> $(document).ready(function(){
var getUploadManager = function(){