Merge pull request #109 from indyplanets/no-jquery

Remove jQuery dependency.
This commit is contained in:
Amos Haviv
2013-10-23 07:30:02 -07:00
6 changed files with 10 additions and 13 deletions

View File

@@ -1,8 +1,3 @@
script(type='text/javascript', src='/lib/jquery/jquery.js')
//Bootstrap
script(type='text/javascript', src='/lib/bootstrap-assets/js/bootstrap.js')
//AngularJS
script(type='text/javascript', src='/lib/angular/angular.js')
script(type='text/javascript', src='/lib/angular-cookies/angular-cookies.js')
@@ -10,6 +5,7 @@ script(type='text/javascript', src='/lib/angular-resource/angular-resource.js')
//Angular UI
script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap-tpls.js')
script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap.js')
script(type='text/javascript', src='/lib/angular-ui-utils/modules/route/route.js')
//Application Init

View File

@@ -19,8 +19,8 @@ head
meta(property='og:site_name', content='MEAN - A Modern Stack')
meta(property='fb:admins', content='APP_ADMIN')
link(rel='stylesheet', href='/lib/bootstrap-assets/css/bootstrap.css')
link(rel='stylesheet', href='/lib/bootstrap-assets/css/bootstrap-responsive.css')
link(rel='stylesheet', href='/lib/bootstrap-css-only/css/bootstrap.css')
link(rel='stylesheet', href='/lib/bootstrap-css-only/css/bootstrap-responsive.css')
link(rel='stylesheet', href='/css/common.css')
link(rel='stylesheet', href='/css/views/articles.css')

View File

@@ -2,7 +2,7 @@
html(lang='en', xmlns='http://www.w3.org/1999/xhtml', xmlns:fb='https://www.facebook.com/2008/fbml', itemscope='itemscope', itemtype='http://schema.org/Product')
include ../includes/head
body
header.navbar.navbar-fixed-top.navbar-inverse(data-ng-include="'views/header.html'")
.navbar.navbar-inverse.navbar-fixed-top(data-ng-include="'views/header.html'", data-role="navigation")
section.content
section.container
block content

View File

@@ -2,13 +2,12 @@
"name": "mean",
"version": "1.0.0",
"dependencies": {
"bootstrap-assets": "2.3.2",
"bootstrap-css-only": "latest",
"angular": "~1.0.6",
"angular-resource": "~1.0.6",
"angular-cookies": "~1.0.6",
"angular-bootstrap": "~0.4.0",
"angular-bootstrap": "latest",
"angular-ui-utils": "0.0.4",
"json3": "~3.2.4",
"jquery": "~1.9.1"
"json3": "~3.2.4"
}
}

View File

@@ -8,4 +8,6 @@ angular.module('mean.system').controller('HeaderController', ['$scope', 'Global'
"title": "Create New Article",
"link": "articles/create"
}];
$scope.isCollapsed = false;
}]);

View File

@@ -6,7 +6,7 @@ window.init = function() {
window.bootstrap();
};
$(document).ready(function() {
angular.element(document).ready(function() {
//Fixing facebook bug with redirect
if (window.location.hash == "#_=_") window.location.hash = "";