Skip to content
Snippets Groups Projects
Commit 3b50f8f3 authored by Damien's avatar Damien
Browse files

Optim Angular Prod Browserify & UglifyJs

parent f53dedd6
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 76 additions and 1634 deletions
apps/maarch_entreprise/define.php
+ 3
− 0
View file @ 3b50f8f3
......@@ -27,3 +27,6 @@ require_once 'apps/maarch_entreprise/define_custom.php';
if (!defined('V2_ENABLED')) {
define('V2_ENABLED', false);
}
if (!defined('PROD_MODE')) {
define('PROD_MODE', true);
}
apps/maarch_entreprise/index.php
+ 12
− 6
View file @ 3b50f8f3
......@@ -223,13 +223,19 @@ if(empty($_SESSION['current_basket'])){
$_SESSION['save_list']['template'] = "";
}
if (PROD_MODE) {
?>
<script src="js/angular/main.bundle.min.js"></script>
<?php
} else {
?>
<script>
System.import('js/angular/main.js').catch(function(err){ console.error(err); });
</script>
<?php
}
?>
?>
<script>
System.import('js/angular/main.js').catch(function(err){ console.error(err); });
</script>
<body style="background: url('static.php?filename=loading_big.gif') no-repeat fixed center;" onload="$('maarch_body').style.background='f2f2f2';$('maarch_body').style.backgroundImage='';$('maarch_body').style.backgroundUrl='';$('maarch_content').style.display='block';session_expirate(<?php echo $time;?>, '<?php
echo $_SESSION['config']['businessappurl'];
?>index.php?display=true&page=logout&logout=true');" id="maarch_body">
......
apps/maarch_entreprise/js/aController.js deleted 100644 → 0
+ 0
− 3
View file @ f53dedd6
mainApp.controller("mainCtrl", ["$scope", function($scope) {
}]);
apps/maarch_entreprise/js/angular-route.js deleted 100644 → 0
+ 0
− 1216
View file @ f53dedd6
This diff is collapsed.
apps/maarch_entreprise/js/angular.min.js deleted 100644 → 0
+ 0
− 330
View file @ f53dedd6
This diff is collapsed.
apps/maarch_entreprise/js/angular/app/app.module.ts
+ 1
− 2
View file @ 3b50f8f3
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { RouterModule, Routes } from '@angular/router';
import { RouterModule } from '@angular/router';
import { HttpModule } from '@angular/http';
import { HashLocationStrategy, Location, LocationStrategy } from '@angular/common';
import { AppComponent } from './app.component';
import { SignatureBookComponent, SafeUrlPipe } from './signature-book.component';
......
apps/maarch_entreprise/js/angular/main.bundle.min.js 0 → 100644
+ 43
− 0
View file @ 3b50f8f3
This diff is collapsed.
apps/maarch_entreprise/js/angular/main.js
+ 2
− 0
View file @ 3b50f8f3
"use strict";
var platform_browser_dynamic_1 = require('@angular/platform-browser-dynamic');
var core_1 = require('@angular/core');
var app_module_1 = require('./app/app.module');
core_1.enableProdMode();
platform_browser_dynamic_1.platformBrowserDynamic().bootstrapModule(app_module_1.AppModule);
apps/maarch_entreprise/js/angular/main.ts
+ 2
− 0
View file @ 3b50f8f3
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { enableProdMode } from '@angular/core';
import { AppModule } from './app/app.module';
enableProdMode();
platformBrowserDynamic().bootstrapModule(AppModule);
apps/maarch_entreprise/js/angular/tsconfig.json
+ 4
− 1
View file @ 3b50f8f3
......@@ -9,5 +9,8 @@
"lib": [ "es2015", "dom" ],
"noImplicitAny": true,
"suppressImplicitAnyIndexErrors": true
}
},
"exclude": [
"node_modules"
]
}
apps/maarch_entreprise/js/app.module.js deleted 100644 → 0
+ 0
− 36
View file @ f53dedd6
var mainApp = angular.module("AppModule", ["ngRoute", "ngTable"]);
mainApp.config(['$routeProvider', '$locationProvider', function($routeProvider, $locationProvider) {
$routeProvider
.when("/:basketId/signatureBook/:resId", {
templateUrl : "../../modules/visa/Views/signatureBook.html",
controller : "visaCtrl",
controllerAs : "vm"
});
$locationProvider.hashPrefix('');
}]);
mainApp.filter('datetimeFormat', function($filter)
{
return function(input)
{
if(input == null) {
return "";
}
return $filter('date')(new Date(input), 'dd/MM/yyyy HH:mm');
};
});
mainApp.filter('dateFormat', function($filter)
{
return function(input)
{
if(input == null) {
return "";
}
return $filter('date')(new Date(input), 'dd/MM/yyyy');
};
});
apps/maarch_entreprise/js/ng-table.min.js deleted 100644 → 0
+ 0
− 2
View file @ f53dedd6
This diff is collapsed.
apps/maarch_entreprise/merged_jsAbstract.php
+ 3
− 11
View file @ 3b50f8f3
......@@ -44,9 +44,6 @@ class MergedJsAbstract {
include('apps/maarch_entreprise/js/prototype.js');
include('apps/maarch_entreprise/js/scriptaculous.js');
include('apps/maarch_entreprise/js/jquery.min.js');
include('apps/maarch_entreprise/js/angular.min.js');
include('apps/maarch_entreprise/js/angular-route.js');
include('apps/maarch_entreprise/js/ng-table.min.js');
include('apps/maarch_entreprise/js/indexing.js');
include('apps/maarch_entreprise/js/scrollbox.js');
include('apps/maarch_entreprise/js/effects.js');
......@@ -58,9 +55,9 @@ class MergedJsAbstract {
include('apps/maarch_entreprise/js/Chart.js');
include('apps/maarch_entreprise/js/chosen.proto.min.js');
include('apps/maarch_entreprise/js/event.simulate.js');
include('apps/maarch_entreprise/js/RSVP.js');
include('apps/maarch_entreprise/js/render.js');
include('apps/maarch_entreprise/js/jio.js');
// include('apps/maarch_entreprise/js/RSVP.js');
// include('apps/maarch_entreprise/js/render.js');
// include('apps/maarch_entreprise/js/jio.js');
readfile('node_modules/core-js/client/shim.js');
readfile('node_modules/zone.js/dist/zone.js');
......@@ -79,11 +76,6 @@ class MergedJsAbstract {
{
include('modules/'.$_SESSION['modules_loaded'][$value]['name'].'/js/functions.js');
}
if(file_exists($_SESSION['config']['corepath'].'custom/'.$_SESSION['custom_override_id'].'/modules/'.$_SESSION['modules_loaded'][$value]['name'].'/js/aController.js')
|| file_exists($_SESSION['config']['corepath'].'/modules/'.$_SESSION['modules_loaded'][$value]['name'].'/js/aController.js'))
{
include('modules/'.$_SESSION['modules_loaded'][$value]['name'].'/js/aController.js');
}
}
}
}
......
modules/basket/js/aController.js deleted 100644 → 0
+ 0
− 24
View file @ f53dedd6
mainApp.controller("basketCtrl", ["$scope", "$http", "$compile", function($scope, $http, $compile) {
//$scope.getView = function(res_id, service, module) {
//
// $http({
// method : 'POST',
// url : globalConfig.coreurl + 'rest.php?module=' + module + '&service=' + service + '&method=getViewDatas',
// headers: {'Content-Type': 'application/x-www-form-urlencoded'},
// data : $j.param({
// resId : res_id
// })
// }).then(function successCallback(response) {
// var elem = angular.element(response.data.result.view);
//
// $j('#divList').html(elem);
// $scope.signatureBook = response.data.result.datas;
// $compile(elem)($scope);
//
// }, function errorCallback(response) {
// console.log(response);
// });
//};
}]);
\ No newline at end of file
package.json
+ 6
− 3
View file @ 3b50f8f3
{
"name": "MaarchCourrier",
"version": "2.0 Beta",
"description": "MaarchCourrier",
"scripts": {
"build": "tsc -p apps/maarch_entreprise/js/angular/",
"build:watch": "tsc -p apps/maarch_entreprise/js/angular/ -w"
"build:watch": "tsc -p apps/maarch_entreprise/js/angular/ -w",
"build-prod": "npm run build && browserify -s main apps/maarch_entreprise/js/angular/main.js > apps/maarch_entreprise/js/angular/main.bundle.js && npm run minify",
"minify": "uglifyjs apps/maarch_entreprise/js/angular/main.bundle.js --compress --mangle --output apps/maarch_entreprise/js/angular/main.bundle.min.js"
},
"keywords": [],
"author": "Maarch",
......@@ -23,7 +24,9 @@
"systemjs": "0.19.40",
"core-js": "^2.4.1",
"rxjs": "5.0.1",
"zone.js": "^0.7.4"
"zone.js": "^0.7.4",
"browserify": "^13.0.1",
"uglifyjs": "^2.4.10"
},
"devDependencies": {
"typescript": "~2.0.10",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment