Skip to content

Commit d241228

Browse files
C0ZENC0ZEN
committed
Multiple changes to create the real release version.
No logs, no dev mod, no admin shortcuts, no devtools. Fixed an error with ui-router.
1 parent 9894274 commit d241228

File tree

10 files changed

+171
-147
lines changed

10 files changed

+171
-147
lines changed

‎Gruntfile.js

+9-2
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ module.exports = function (grunt) {
203203
files: [{
204204
dot: true,
205205
src: [
206-
'.tmp',
206+
'.tmp/release/**',
207207
'<%= yeoman.release %>/**/*',
208208
'!<%= yeoman.release %>/bower_components/**'
209209
]
@@ -242,7 +242,10 @@ module.exports = function (grunt) {
242242
// Automatically inject Bower components into the app
243243
wiredep: {
244244
app : {
245-
src : ['<%= yeoman.app %>/index.html'],
245+
src : [
246+
'<%= yeoman.app %>/index.html',
247+
'<%= yeoman.app %>/index.release.html'
248+
],
246249
ignorePath: /\.\.\//
247250
},
248251
test: {
@@ -334,6 +337,7 @@ module.exports = function (grunt) {
334337
]
335338
}
336339
},
340+
337341
uglify: {
338342
dist : {
339343
files: {
@@ -343,6 +347,9 @@ module.exports = function (grunt) {
343347
}
344348
},
345349
releaseMain: {
350+
options: {
351+
mangle: false // Avoid error with ui-router redirection (dependency renamed and not found...)
352+
},
346353
files: {
347354
'<%= yeoman.release %>/main.min.js': [
348355
'<%= yeoman.app %>/**/*.js',

‎app/app.release.config.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
CozenThemesProvider.setActiveTheme('atom');
3131
CozenConfigProvider
3232
.scrollsBar(false)
33-
.debug(true)
34-
.dev(true)
35-
.logsEnabled(true)
33+
.debug(false)
34+
.dev(false)
35+
.logsEnabled(false)
3636
.dropdownAutoCloseOthers(true)
3737
.inputModelLengthType('focus')
3838
.textareaModelLengthType('focus')
@@ -45,7 +45,7 @@
4545
.popupFooter(false)
4646
.btnToggleStartRight(false);
4747
CozenLazyLoadProvider
48-
.log(true)
48+
.log(false)
4949
.positionTop('70px')
5050
.positionLeft('10px');
5151
CozenFloatingFeedProvider

‎app/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<script src="bower_components/angular-route/angular-route.js"></script>
7878
<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
7979
<script src="bower_components/angular-touch/angular-touch.js"></script>
80-
<script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
80+
<script src="bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
8181
<script src="bower_components/angular-translate/angular-translate.js"></script>
8282
<script src="bower_components/angular-translate-loader-url/angular-translate-loader-url.js"></script>
8383
<script src="bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files.js"></script>

‎app/index.release.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
<script src="bower_components/angular-route/angular-route.js"></script>
8181
<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
8282
<script src="bower_components/angular-touch/angular-touch.js"></script>
83-
<script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
83+
<script src="bower_components/angular-ui-router/release/angular-ui-router.min.js"></script>
8484
<script src="bower_components/angular-translate/angular-translate.js"></script>
8585
<script src="bower_components/angular-translate-loader-url/angular-translate-loader-url.js"></script>
8686
<script src="bower_components/angular-translate-loader-static-files/angular-translate-loader-static-files.js"></script>

‎app/scripts/controllers/app.ctrl.js

+16-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717
'$rootScope',
1818
'$state',
1919
'$stateParams',
20-
'cozenLanguage'
20+
'cozenLanguage',
21+
'$timeout'
2122
];
2223

2324
function AppCtrl(CONFIG, userFactory, $scope, localStorageService, $window, usersFactory, groupsFactory,
24-
cozenEnhancedLogs, $rootScope, $state, $stateParams, cozenLanguage) {
25+
cozenEnhancedLogs, $rootScope, $state, $stateParams, cozenLanguage, $timeout) {
2526
var app = this;
2627

2728
// Common data
@@ -34,7 +35,13 @@
3435
};
3536

3637
// When the window is ready
37-
$window.onload = app.methods.onInit;
38+
// Note: removed the window.onLoad because it is sometimes not trigger
39+
// If it is not trigger, the app will just not works so it's a huge problem ;)
40+
$timeout(function () {
41+
$timeout(function () {
42+
app.methods.onInit();
43+
});
44+
});
3845

3946
// Update the configuration of the language when the url lang param was changed
4047
$rootScope.$on('$stateChangeStart', function (event, toState, toParams, fromState, fromParams) {
@@ -43,6 +50,12 @@
4350
}
4451
});
4552

53+
// Just to log the error when one occurred
54+
$rootScope.$on('$stateChangeError', function (event, toState, toParams, fromState, fromParams) {
55+
console.trace();
56+
console.log(arguments);
57+
});
58+
4659
function onInit() {
4760
cozenEnhancedLogs.wrap.end('windowOnLoad');
4861
cozenEnhancedLogs.wrap.starting('cogeoInit');

‎app/views/common/navbar/navbar.top.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -181,39 +181,39 @@
181181
</div>
182182
<div class="link-dropdown-item"
183183
ng-class="{'active': goTo.isOneOfThoseViews('app.account.profile', 'app.account.profileEdit', 'app.account.profileEditPassword')}"
184-
ng-click="goTo.view('app.account.profile')"
184+
ng-click="goTo.view('app.account.profile', null, $event)"
185185
ng-mouseenter="linkHoverProfile = 'account'"
186186
tabindex="0">
187187
<i class="fa fa-fw icons8-user-male space-small-right"></i>
188188
{{ 'navbar_other_profile' | translate }}
189189
</div>
190190
<div class="link-dropdown-item"
191191
ng-class="{'active': goTo.isOneOfThoseViews('app.account.notifications', 'app.account.notificationsEdit')}"
192-
ng-click="goTo.view('app.account.notifications')"
192+
ng-click="goTo.view('app.account.notifications', null, $event)"
193193
ng-mouseenter="linkHoverProfile = 'account'"
194194
tabindex="0">
195195
<i class="fa fa-fw icons8-appointment-reminders space-small-right"></i>
196196
{{ 'navbar_other_notifications' | translate }}
197197
</div>
198198
<div class="link-dropdown-item"
199199
ng-class="{'active': goTo.isOneOfThoseViews('app.account.settings', 'app.account.settingsEdit')}"
200-
ng-click="goTo.view('app.account.settings')"
200+
ng-click="goTo.view('app.account.settings', null, $event)"
201201
ng-mouseenter="linkHoverProfile = 'account'"
202202
tabindex="0">
203203
<i class="fa fa-fw icons8-settings space-small-right"></i>
204204
{{ 'navbar_other_settings' | translate }}
205205
</div>
206206
<div class="link-dropdown-item"
207207
ng-class="{'active': goTo.isOneOfThoseViews('app.account.log')}"
208-
ng-click="goTo.view('app.account.log')"
208+
ng-click="goTo.view('app.account.log', null, $event)"
209209
ng-mouseenter="linkHoverProfile = 'account'"
210210
tabindex="0">
211211
<i class="fa fa-fw icons8-hourglass-filled space-small-right"></i>
212212
{{ 'navbar_other_log' | translate }}
213213
</div>
214214
<div class="link-dropdown-item"
215215
ng-class="{'active': goTo.isOneOfThoseViews('app.account.logins')}"
216-
ng-click="goTo.view('app.account.logins')"
216+
ng-click="goTo.view('app.account.logins', null, $event)"
217217
ng-mouseenter="linkHoverProfile = 'account'"
218218
tabindex="0">
219219
<i class="fa fa-fw icons8-login-rounded-right space-small-right"></i>
@@ -228,15 +228,15 @@
228228
</div>
229229
<div class="link-dropdown-item link-dropdown-item-purple"
230230
ng-class="{'active': goTo.isOneOfThoseViews('app.social.friends')}"
231-
ng-click="goTo.view('app.social.friends')"
231+
ng-click="goTo.view('app.social.friends', null, $event)"
232232
ng-mouseenter="linkHoverProfile = 'social'"
233233
tabindex="0">
234234
<i class="fa fa-fw icons8-user-groups space-small-right"></i>
235235
{{ 'navbar_other_friends' | translate }}
236236
</div>
237237
<div class="link-dropdown-item link-dropdown-item-purple"
238238
ng-class="{'active': goTo.isOneOfThoseViews('app.social.invitations', 'app.social.recruit')}"
239-
ng-click="goTo.view('app.social.invitations')"
239+
ng-click="goTo.view('app.social.invitations', null, $event)"
240240
ng-mouseenter="linkHoverProfile = 'social'"
241241
tabindex="0">
242242
<i class="fa fa-fw icons8-message-filled space-small-right"></i>

0 commit comments

Comments
 (0)