Skip to content

index.html cleaned up; added dependencies.js service; pleased jshint #2

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

Open
nicolae-olariu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

index.html cleaned up; added dependencies.js service; pleased jshint #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
76 changes: 34 additions & 42 deletions app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
<meta name="viewport" content="width=device-width">
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
<!-- build:css styles/vendor.css -->
<!-- bower:css -->
<!-- endbower -->
<!-- bower:css -->
<!-- endbower -->
<!-- endbuild -->
<!-- build:css({.tmp,app}) styles/main.css -->
<link rel="stylesheet" href="styles/main.css">
<link rel="stylesheet" href="styles/logo.css">
<link rel="stylesheet" href="styles/main.css">
<link rel="stylesheet" href="styles/logo.css">
<!-- endbuild -->
</head>
<body ng-app="loremImageLogoApp">
Expand All @@ -26,48 +26,40 @@
<!-- Add your site or application content here -->
<div class="container" ng-view=""></div>

<!-- Google Analytics: change UA-XXXXX-X to be your site's ID -->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-XXXXX-X');
ga('send', 'pageview');
</script>

<!--[if lt IE 9]>
<script src="bower_components/es5-shim/es5-shim.js"></script>
<script src="bower_components/json3/lib/json3.min.js"></script>
<script src="bower_components/es5-shim/es5-shim.js"></script>
<script src="bower_components/json3/lib/json3.min.js"></script>
<![endif]-->

<!-- build:js scripts/vendor.js -->
<!-- bower:js -->
<script src="bower_components/jquery/dist/jquery.js"></script>
<script src="bower_components/angular/angular.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/affix.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/alert.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/button.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/carousel.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/collapse.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/dropdown.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/tab.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/transition.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/scrollspy.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/modal.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/tooltip.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/popover.js"></script>
<script src="bower_components/angular-route/angular-route.js"></script>
<script src="bower_components/lodash/dist/lodash.compat.js"></script>
<script src="bower_components/angular-safeapply/safe-apply.js"></script>
<!-- endbower -->
<!-- bower:js -->
<script src="bower_components/jquery/dist/jquery.js"></script>
<script src="bower_components/angular/angular.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/affix.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/alert.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/button.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/carousel.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/collapse.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/dropdown.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/tab.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/transition.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/scrollspy.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/modal.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/tooltip.js"></script>
<script src="bower_components/bootstrap-sass-official/vendor/assets/javascripts/bootstrap/popover.js"></script>
<script src="bower_components/angular-route/angular-route.js"></script>
<script src="bower_components/lodash/dist/lodash.compat.js"></script>
<script src="bower_components/angular-safeapply/safe-apply.js"></script>
<!-- endbower -->
<!-- endbuild -->

<!-- build:js({.tmp,app}) scripts/scripts.js -->
<script src="scripts/app.js"></script>
<script src="scripts/controllers/main.js"></script>
<script src="scripts/controllers/logo.js"></script>
<!-- endbuild -->
</body>
<!-- build:js({.tmp,app}) scripts/scripts.js -->
<script src="scripts/app.js"></script>

<script src="scripts/services/dependencies.js"></script>

<script src="scripts/controllers/main.js"></script>
<script src="scripts/controllers/logo.js"></script>
<!-- endbuild -->
</body>
</html>
10 changes: 5 additions & 5 deletions app/scripts/controllers/logo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

angular.module('loremImageLogoApp')
.controller('LogoCtrl', function ($scope, $timeout, $safeApply) {
.controller('LogoCtrl', ['$scope', '$timeout', '$safeApply', '_', function ($scope, $timeout, $safeApply, _) {


// $scope.loadingState = true;
Expand All @@ -10,10 +10,10 @@ angular.module('loremImageLogoApp')
// }, 1000);

$scope.sections = ['No Section'].concat('abstract animals business cats city food nightlife fashion people nature sports technics transport'.split(' ').sort())
.map(function(section, i) {
.map(function(section) {
return {
label: section,
value: section == 'No Section' ? null : section
value: section === 'No Section' ? null : section
};
});

Expand Down Expand Up @@ -48,10 +48,10 @@ angular.module('loremImageLogoApp')

$scope.getUncachedImageUrl = function(cacheToken) {
return $scope.imageUrl + '?no-cache=' + cacheToken;//(cacheToken || ((+ new Date) + '_' + Math.random()));
}
};

$scope.$watch('imageParams', _.throttle(function() {
$scope.paramsToUrl();
$safeApply();
}, 100, true) , true);
});
}]);
35 changes: 35 additions & 0 deletions app/scripts/services/dependencies.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
// create factory aliases for any 3rd party component
// in order to make them testable and to use them through angular's DI mechanism
// this also prevents accessing unsafe global variables and please jshint
// @usage:
// angular.module('loremImageLogoApp').controller('someController', function(jQuery) {
// // use jQuery here, as it's not a global var pinned on the window object
// // later on, if you want to use jqueryLite instead of jQuery, you could easily modify
// })

(function() {
'use strict';

var module = angular.module('loremImageLogoApp'),

// function that creates a factory returning the actual global variable
createFactory = function (dependency) {
module.factory(dependency, ['$window', function ($window) {
return $window[dependency];
}]);
},

// this is the list of the used js dependencies
jsDependencies = ['jQuery', '_'];

// store them as avalue in angular
// so we can test all th dependencies
module.value('jsDependencies', jsDependencies);

// special case for $ jQuery
module.factory('$', ['$window', function($window) {
return $window.jQuery;
}]);

angular.forEach(jsDependencies, createFactory);
})();