Skip to content

Strict di and debug data #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ongk merged 4 commits into from
Jan 9, 2016
Merged

Strict di and debug data #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
515f44c
Installing JavaScript libraries
shaoquan-chen-at-hpe Jan 8, 2016
fb16359
Install font-awesome and enabling theming
shaoquan-chen-at-hpe Jan 8, 2016
57ddc59
Defining base path for ui-framework
shaoquan-chen-at-hpe Jan 8, 2016
4bed4ad
Enabling ng-strict-di and disabling debug data on DOM
shaoquan-chen-at-hpe Jan 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
'use strict';

expose({
gettext: gettext
gettext: gettext,

env: {
HELION_UI_FRAMEWORK_BASE_PATH: 'lib/helion-ui-framework/'
}

});

function gettext(text) {
Expand Down
4 changes: 2 additions & 2 deletions src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!doctype html>
<html>
<html ng-app="green-box-ui" ng-strict-di>
<head>
<meta charset="utf-8">
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
Expand All @@ -9,6 +9,6 @@
<!-- inject:js -->
<!-- endinject -->
</head>
<body ng-app="green-box-ui" app>
<body app>
Copy link
Copy Markdown
Contributor

@ongk ongk Jan 9, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the 'app' for here?

It is just for testing if angular works, will be changed or removed.

</body>
</html>
30 changes: 28 additions & 2 deletions src/index.module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,44 @@
'use strict';

var angularModules = [
'ngSanitize'
];

var otherModules = [
'helion.framework'
'gettext',
'helion.framework',
'ui.bootstrap',
'ui.router'
];

angular
.module('green-box-ui', [
'app'
]
.concat(angularModules)
.concat(otherModules)
.concat(otherModules),
config
);

config.$inject = [
'$compileProvider'
];

function config($compileProvider) {

/**
* Disabling Debug Data
*
* To manually enable debug data, open up a debug console in the browser
* then call this method directly in this console:
*
* ```
* angular.reloadWithDebugInfo();
* ```
*
* https://docs.angularjs.org/guide/production
*/
$compileProvider.debugInfoEnabled(false);
}

})();
13 changes: 11 additions & 2 deletions src/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
//@import "lib/helion-ui-theme/mixins";
//@import "lib/helion-ui-theme/variables";
// theme
@import "lib/helion-ui-theme/default/variables";
@import "lib/helion-ui-theme/mixins";
@import "lib/helion-ui-theme/variables";

// libs
$fa-font-path: "lib/font-awesome/fonts";
@import "lib/font-awesome/scss/font-awesome";
@import "lib/bootstrap-sass-official/assets/stylesheets/bootstrap";
@import "lib/helion-ui-framework/framework";

// app
@import "app/app";
18 changes: 16 additions & 2 deletions tools/bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,22 @@
"tests"
],
"dependencies": {
"angular": "1.3.4",
"angular": "~1.3.7",
"angular-bootstrap": "~1.0.0",
"angular-gettext": "~2.2.0",
"angular-sanitize": "~1.3.7",
"angular-ui-router": "~0.2.15",
"bootstrap-sass-official": "3.3.5",
"font-awesome": "~4.5.0",
"helion-ui-framework": "../../helion-ui-framework/",
"helion-ui-theme": "../../helion-ui-theme/"
"helion-ui-theme": "../../helion-ui-theme/",
"lodash": "~3.10.1"
},
"devDependencies": {
"angular-mocks": "~1.3.7"
},
"resolutions": {
"angular": "~1.3.7",
"angular-mocks": "~1.3.7"
}
}
6 changes: 6 additions & 0 deletions tools/gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ var jsSourceFiles = [

var jsLibs = [
paths.dist + 'lib/angular/angular.js',
paths.dist + 'lib/angular-gettext/dist/angular-gettext.js',
paths.dist + 'lib/angular-sanitize/angular-sanitize.js',
paths.dist + 'lib/angular-bootstrap/ui-bootstrap.js',
paths.dist + 'lib/angular-bootstrap/ui-bootstrap-tpls.js',
paths.dist + 'lib/angular-ui-router/release/angular-ui-router.js',
paths.dist + 'lib/lodash/lodash.js',
paths.dist + 'lib/helion-ui-framework/**/*.module.js',
paths.dist + 'lib/helion-ui-framework/**/*.js'
];
Expand Down
9 changes: 8 additions & 1 deletion tools/karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,14 @@ module.exports = function (config) {
files: [
'config.js',

'lib/angular/angular.min.js',
'lib/angular/angular.js',
'lib/angular-gettext/dist/angular-gettext.js',
'lib/angular-sanitize/angular-sanitize.js',
'lib/angular-bootstrap/ui-bootstrap.js',
'lib/angular-bootstrap/ui-bootstrap-tpls.js',
'lib/angular-ui-router/release/angular-ui-router.js',
'lib/lodash/lodash.js',

'lib/helion-ui-framework/**/*.module.js',
'lib/helion-ui-framework/**/!(*.mock|*.spec).js',
'lib/helion-ui-framework/**/!(*.mock).html',
Expand Down