Skip to content

Move partial template to the JS file to prevent COORS errors. #1

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
ryangasparini-wf wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Move partial template to the JS file to prevent COORS errors. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fd52c38
Replaced the partial with inline HTML to prevent COORS errors when no…
ryangasparini-wf Nov 29, 2012
351c351
Added console calls and a service to verify when controllers are called.
ryangasparini-wf Nov 29, 2012
62cc6bc
Updated the home links in index.html
ryangasparini-wf Nov 29, 2012
c7eff4b
Moved all the assets to a public folder for use with pow.
ryangasparini-wf Nov 29, 2012
133d369
Added public files for routes example.
ryangasparini-wf Jan 24, 2013
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
Empty file modified README.md
100644 → 100755
View file
Open in desktop
Empty file.
23 changes: 0 additions & 23 deletions js/website.js
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions partials/basic-template.html
View file
Open in desktop

This file was deleted.

0 css/bootstrap/css/bootstrap-responsive.css → ...ss/bootstrap/css/bootstrap-responsive.css
View file
Open in desktop
File renamed without changes.
0 ...ootstrap/css/bootstrap-responsive.min.css → ...ootstrap/css/bootstrap-responsive.min.css
View file
Open in desktop
File renamed without changes.
0 css/bootstrap/css/bootstrap.css → public/test/css/bootstrap/css/bootstrap.css
View file
Open in desktop
File renamed without changes.
0 css/bootstrap/css/bootstrap.min.css → .../test/css/bootstrap/css/bootstrap.min.css
View file
Open in desktop
File renamed without changes.
0 ...tstrap/img/glyphicons-halflings-white.png → ...tstrap/img/glyphicons-halflings-white.png
View file
Open in desktop
File renamed without changes
0 css/bootstrap/img/glyphicons-halflings.png → ...ss/bootstrap/img/glyphicons-halflings.png
View file
Open in desktop
File renamed without changes
0 css/bootstrap/js/bootstrap.js → public/test/css/bootstrap/js/bootstrap.js
View file
Open in desktop
File renamed without changes.
0 css/bootstrap/js/bootstrap.min.js → ...ic/test/css/bootstrap/js/bootstrap.min.js
View file
Open in desktop
File renamed without changes.
0 css/website.css → public/test/css/website.css
View file
Open in desktop
File renamed without changes.
0 images/logo.png → public/test/images/logo.png
View file
Open in desktop
File renamed without changes
0 images/top-li-a.jpg → public/test/images/top-li-a.jpg
View file
Open in desktop
File renamed without changes
0 images/top-shadow.png → public/test/images/top-shadow.png
View file
Open in desktop
File renamed without changes
21 changes: 13 additions & 8 deletions index.html → public/test/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@

<!doctype html>
<html ng-app="website">
<head>
<title>AngularJS Website</title>

<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min.js"></script>
<script type="text/javascript" src="js/website.js"></script>
<meta name="X-UA-Compatible" content="IE=edge,chrome=1">
<base href="/test/">
<link rel="stylesheet" href="css/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="css/website.css">
</head>
<body>
<body ng-controller="MainCtrl">
<!-- top -->
<header id="header">
<h1 id="logo"><a href="#/home"></a></h1>
<h1 id="logo"><a href="./"></a></h1>

<div id="menu">
<a href="#/home" class="btn">Home</a>
<a href="#/about" class="btn">About</a>
<a href="#/experiments" class="btn">Experiments</a>
<a href="./" class="btn">Home</a>
<a href="./about" class="btn">About</a>
<a href="./experiments" class="btn">Experiments</a>
<a href="./unicorn" class="btn">Unicorn</a>
</div>
<div class="color"></div>
<div class="clear"></div>
Expand All @@ -27,5 +28,9 @@ <h1 id="logo"><a href="#/home"></a></h1>
<div id="container">
<div ng-view></div>
</div>

<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.4/angular.min.js"></script>
<script src="js/website.js"></script>

</body>
</html>
82 changes: 82 additions & 0 deletions public/test/js/website.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@

var homeCount = 1;

console.log("First time!");

function MainCtrl($scope) {
$scope.$on('$routeChangeError', function(current, previous, rejection) {
console.log("routeChangeError", currrent, previous, rejection);
});

$scope.$on('$routeChangeStart', function(next, current) {
console.log("routeChangeStart");
console.dir(next);
console.dir(current);
});

$scope.$on('$routeChangeSuccess', function(current, previous) {
console.log("routeChangeSuccess");
console.dir(current);
console.dir(previous);
});

$scope.$on('$routeUpdate', function(rootScope) {
console.log("routeUpdate", rootScope);
});
}

function AboutCtrl($scope) {
console.log('about called');
$scope.title = 'About Page';
$scope.body = 'This is the about page body';
}

function ExperimentsCtrl($scope) {
console.log('exp called');
$scope.title = 'Experiments Page';
$scope.body = 'This is the about experiments body';
}

function HomeCtrl($scope, TestService) {
console.log('home called', arguments);
$scope.title = 'Home Page';
$scope.body = 'This is the about home body ' + homeCount++;
}

function PageCtrl($scope, $routeParams, alias) {
console.log('page called', $routeParams);
$scope.title = alias;
$scope.body = "This is a alias page for " + alias;
}

function resolveAlias($q, $route, $timeout) {
var alias = $route.current.params.alias;
var deferred = $q.defer();
deferred.resolve(alias);
return deferred.promise;
}

function TestService() {
console.log("test service");
return { test: 'test' };
}

var basic = '<h1>{{title}}</h1><p>{{body}}</p>';

var app = angular.module('website', []);

app.config( function($routeProvider, $locationProvider) {
$routeProvider.
when('/', { template: basic, controller: HomeCtrl, reloadOnSearch: false }).
when('/about', { template: basic, controller: AboutCtrl, reloadOnSearch: false }).
when('/experiments', { template: basic, controller: ExperimentsCtrl, reloadOnSearch: false }).
when('/:alias', { template: basic, controller: PageCtrl, reloadOnSearch: false, resolve: { alias: resolveAlias } }).
otherwise({ redirectTo: '/' });

$locationProvider.html5Mode('true');
} );

app.factory('TestService', TestService);

HomeCtrl.$inject = ['$scope', 'TestService'];
PageCtrl.$inject = ['$scope', '$routeParams', 'alias'];
0 partials/about.html → public/test/partials/about.html
View file
Open in desktop
File renamed without changes.
0 partials/experiments.html → public/test/partials/experiments.html
View file
Open in desktop
File renamed without changes.
0 partials/home.html → public/test/partials/home.html
View file
Open in desktop
File renamed without changes.