Skip to content

Commit

Permalink
Clean up src/angular-app/**/vendor files
Browse files Browse the repository at this point in the history
Some vendor JS files are not getting rsync'd to the dev/E2E sites.  Clean up the src/angular-app/**/vendor folders and ensure those JS files get deployed

-Use bower for angular-sortable-view and moment dependencies
-Remove deprecated modules wc.Directives and angular-hammer 
-Update rsync to ensure /angular-app/languageforge/lexicon/js/vendor files are deployed
darcywong00 committed Feb 17, 2017
1 parent e006476 commit 6d08814
Showing 17 changed files with 17 additions and 753 deletions.
1 change: 0 additions & 1 deletion src/angular-app/bellows/apps/activity/activity.js
Original file line number Diff line number Diff line change
@@ -8,7 +8,6 @@ angular.module('activity',
'bellows.filters',
'ui.bootstrap',
'sgw.ui.breadcrumb',
'wc.Directives'
])
.controller('ActivityCtrl', ['$scope', '$sce', 'activityPageService', 'sfchecksLinkService',
'sessionService', 'utilService', 'breadcrumbService',
2 changes: 1 addition & 1 deletion src/angular-app/bellows/apps/projects/projects.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

angular.module('projects', ['bellows.services', 'palaso.ui.listview', 'ui.bootstrap',
'palaso.ui.notice', 'palaso.ui.utils', 'wc.Directives'
'palaso.ui.notice', 'palaso.ui.utils'
])
.controller('ProjectsCtrl', ['$scope', 'projectService', 'sessionService', 'silNoticeService',
function ($scope, projectService, ss, notice) {
4 changes: 0 additions & 4 deletions src/angular-app/bellows/cssBootstrap4/wc-overlay.css

This file was deleted.

83 changes: 0 additions & 83 deletions src/angular-app/bellows/js/vendor/angular-hammer.js

This file was deleted.

This file was deleted.

This file was deleted.

9 changes: 0 additions & 9 deletions src/angular-app/bellows/js/vendor/hammer.min.js

This file was deleted.

1 change: 0 additions & 1 deletion src/angular-app/bellows/js/vendor/hammer.min.map

This file was deleted.

6 changes: 0 additions & 6 deletions src/angular-app/bellows/js/vendor/moment-2.1.0-min.js

This file was deleted.

452 changes: 0 additions & 452 deletions src/angular-app/bellows/js/vendor/ngRepeatReorder.js

This file was deleted.

162 changes: 0 additions & 162 deletions src/angular-app/bellows/js/vendor/wcAngularOverlay.js

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

angular.module('semdomtrans-app-management', ['semDomTransAppManagement.services', 'bellows.services', 'palaso.ui.listview', 'ui.bootstrap', 'palaso.ui.notice', 'palaso.ui.utils', 'wc.Directives'])
angular.module('semdomtrans-app-management', ['semDomTransAppManagement.services', 'bellows.services', 'palaso.ui.listview', 'ui.bootstrap', 'palaso.ui.notice', 'palaso.ui.utils'])
.controller('semDomTransAppManagementCtrl', ['$scope', 'semDomTransAppManagementService', 'sessionService', 'silNoticeService', '$window',
function($scope, appService, ss, notice, $window) {

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

angular.module('sfchecks-new-project', ['ui.router', 'ui.bootstrap', 'bellows.services',
'palaso.ui.listview', 'palaso.ui.notice', 'palaso.ui.utils', 'wc.Directives'])
'palaso.ui.listview', 'palaso.ui.notice', 'palaso.ui.utils'])
.config(['$stateProvider', '$urlRouterProvider',
function ($stateProvider, $urlRouterProvider) {
// State machine from ui.router
3 changes: 1 addition & 2 deletions src/angular-app/scriptureforge/sfchecks/sfchecks.js
Original file line number Diff line number Diff line change
@@ -12,8 +12,7 @@ angular.module('sfchecks',
'sfchecks.filters',
'bellows.filters',
'palaso.ui.notice',
'sf.ui.invitefriend',
'wc.Directives'
'sf.ui.invitefriend'
])
.config(['$routeProvider', function ($routeProvider) {
// the "projects" route is a hack to redirect to the /app/projects URL.
16 changes: 9 additions & 7 deletions src/app_dependencies.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
{
"angular-animate": { "path": "vendor_bower/angular-animate" },
"angular-route": { "path": "vendor_bower/angular-route" },
"angular-ui-router": { "path": "vendor_bower/angular-ui-router/release" },
"angular-sortable-view": { "path": "vendor_bower/angular-sortable-view/src" },
"angular-translate": { "path": "vendor_bower/angular-translate" },
"angular-translate-loader-static-files": { "path": "vendor_bower/angular-translate-loader-static-files" },
"ng-file-upload": { "path": "vendor_bower/ng-file-upload", "jsFile": ["ng-file-upload", "ng-file-upload-shim"] },
"lodash": { "path": "vendor_bower/lodash/dist" },
"rangy": { "path": "vendor_bower/rangy", "jsFile": ["rangy-core", "rangy-selectionsaverestore", "rangy-highlighter", "rangy-classapplier", "rangy-serializer", "rangy-textrange"] },
"textAngular": { "path": "vendor_bower/textAngular/dist", "jsFile": ["textAngular-sanitize", "textAngularSetup", "textAngular"], "jsMinFile": ["textAngular-sanitize", "textAngular"], "cssFile": "textAngular" },
"angular-truncate-2": { "path": "vendor_bower/angular-truncate-2/dist" },
"angular-ui-router": { "path": "vendor_bower/angular-ui-router/release" },
"angular-ui-validate": { "path": "vendor_bower/angular-ui-validate/dist", "jsFile": "validate" },
"intl-tel-input": { "path": "vendor_bower/intl-tel-input/build", "jsFile": "js/intlTelInput", "cssFile": "css/intlTelInput" },
"font-awesome": { "path": "vendor_bower/font-awesome/css", "cssFile": "font-awesome" },
"soundmanager2": { "path": "vendor_bower/SoundManager2/script", "jsFile": "soundmanager2", "jsMinFile": "soundmanager2-nodebug-jsmin.js" }
"intl-tel-input": { "path": "vendor_bower/intl-tel-input/build", "jsFile": "js/intlTelInput", "cssFile": "css/intlTelInput" },
"lodash": { "path": "vendor_bower/lodash/dist" },
"moment": { "path": "vendor_bower/moment", "jsFile": ["moment"], "jsMinFile": ["min/moment"]},
"ng-file-upload": { "path": "vendor_bower/ng-file-upload", "jsFile": ["ng-file-upload", "ng-file-upload-shim"] },
"rangy": { "path": "vendor_bower/rangy", "jsFile": ["rangy-core", "rangy-selectionsaverestore", "rangy-highlighter", "rangy-classapplier", "rangy-serializer", "rangy-textrange"] },
"soundmanager2": { "path": "vendor_bower/SoundManager2/script", "jsFile": "soundmanager2", "jsMinFile": "soundmanager2-nodebug-jsmin.js" },
"textAngular": { "path": "vendor_bower/textAngular/dist", "jsFile": ["textAngular-sanitize", "textAngularSetup", "textAngular"], "jsMinFile": ["textAngular-sanitize", "textAngular"], "cssFile": "textAngular" }
}
2 changes: 2 additions & 0 deletions src/bower.json
Original file line number Diff line number Diff line change
@@ -8,9 +8,11 @@
"angular-animate": "~1.5",
"angular-route": "~1.5",
"angular-sanitize": "~1.5",
"angular-sortable-view": "^0.0.15",
"angular-ui-router": "~0.3",
"angular-translate": "~2",
"angular-translate-loader-static-files": "~2",
"moment": "^2.17.1",
"ng-file-upload": "~12.0",
"lodash": "~4.14",
"angular-truncate-2": "~0.4.2",
3 changes: 2 additions & 1 deletion upload-include.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# specific files to include
/assets/index.html
/angular-app/bellows/js/assets/*.js
/angular-app/languageforge/lexicon/js/vendor/**

# patterns to include
/angular-app/**/*.min.js
/angular-app/**/**min.js

0 comments on commit 6d08814

Please sign in to comment.