javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-06 22:29:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Lots

Browse Source
This commit is contained in:
Max Lynch
2013-11-13 18:40:23 -06:00
parent 935c3dd2dd
commit 8e738713d5
10 changed files with 85 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dist/js/ionic-angular.js vendored
View File

@ -1194,7 +1194,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
$scope.sideMenuContentTranslateX = 0; $scope.sideMenuContentTranslateX = 0;
$scope.sideMenuCtrl = this; $scope.sideMenuController = this;
}) })
.directive('sideMenu', function() { .directive('sideMenu', function() {
@ -1544,7 +1544,7 @@ angular.module('ionic.ui.tabs', ['ngAnimate'])
}; };
}, },
template: template:
'<a href="#" ng-class="{active:active}" ng-click="selectTab()" class="tab-item">' + '<a ng-class="{active:active}" ng-click="selectTab()" class="tab-item">' +
'<i ng-class="{{icon}}" ng-if="icon"></i>' + '<i ng-class="{{icon}}" ng-if="icon"></i>' +
'<i class="{{iconOn}}" ng-if="active"></i>' + '<i class="{{iconOn}}" ng-if="active"></i>' +
'<i class="{{iconOff}}" ng-if="!active"></i> {{title}}' + '<i class="{{iconOff}}" ng-if="!active"></i> {{title}}' +

6
examples/demos/toderp2/js/controllers.js
View File

@ -26,7 +26,7 @@ angular.module('ionic.todo.controllers', ['ionic.todo'])
$scope.loginForm = { $scope.loginForm = {
email: 'ihasmax@gmail.com', email: 'ihasmax@gmail.com',
password: 'traintown' password: ''
}; };
$scope.close = function() { $scope.close = function() {
@ -134,7 +134,7 @@ angular.module('ionic.todo.controllers', ['ionic.todo'])
$scope.selectProject = function(project) { $scope.selectProject = function(project) {
$scope.setActiveProject(project); $scope.setActiveProject(project);
$scope.sideMenuCtrl.close(); $scope.sideMenuController.close();
}; };
/** /**
@ -162,7 +162,7 @@ angular.module('ionic.todo.controllers', ['ionic.todo'])
$scope.activeProject.title = newProject.title; $scope.activeProject.title = newProject.title;
$scope.activeProject.user_id = newProject.user_id; $scope.activeProject.user_id = newProject.user_id;
$scope.sideMenuCtrl.close(); $scope.sideMenuController.close();
}; };
$scope.deleteProject = function(project) { $scope.deleteProject = function(project) {

7
examples/starters/weather/directives.js
View File

@ -25,7 +25,11 @@ angular.module('ionic.weather.directives', [])
replace: true, replace: true,
transclude: true, transclude: true,
template: '<div id="small-weather" ng-transclude></div>', template: '<div id="small-weather" ng-transclude></div>',
link: function($scope, $element, $attr) {
compile: function(element, attr) {
console.log('SMALL COMPILED');
return function($scope, $element, $attr) {
console.log('SMALL LINKED');
// Delay so we are in the DOM and can calculate sizes // Delay so we are in the DOM and can calculate sizes
$timeout(function() { $timeout(function() {
@ -40,6 +44,7 @@ angular.module('ionic.weather.directives', [])
}); });
} }
} }
}
}) })
.directive('weatherBox', function($timeout) { .directive('weatherBox', function($timeout) {

10
examples/starters/weather/index.html
View File

@ -9,10 +9,11 @@
<link rel="stylesheet" href="weather.css"> <link rel="stylesheet" href="weather.css">
<script src="/vendor/angular/angular-1.2.0rc2.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0/angular.min.js"></script>
<script src="/vendor/angular/angular-touch.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0/angular-touch.js"></script>
<script src="/vendor/angular/angular-animate.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0/angular-animate.js"></script>
<script src="/vendor/angular/angular-resource.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0/angular-resource.js"></script>
<script src="/dist/js/ionic.js"></script> <script src="/dist/js/ionic.js"></script>
<script src="/dist/js/ionic-angular.js"></script> <script src="/dist/js/ionic-angular.js"></script>
@ -20,6 +21,7 @@
<script src="directives.js"></script> <script src="directives.js"></script>
<script src="app.js"></script> <script src="app.js"></script>
</head> </head>
<body ng-controller="WeatherCtrl"> <body ng-controller="WeatherCtrl">
<div id="bg-image" ng-style="getActiveBackgroundImage()"></div> <div id="bg-image" ng-style="getActiveBackgroundImage()"></div>

2
js/ext/angular/src/directive/ionicSideMenu.js vendored
View File

@ -33,7 +33,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
$scope.sideMenuContentTranslateX = 0; $scope.sideMenuContentTranslateX = 0;
$scope.sideMenuCtrl = this; $scope.sideMenuController = this;
}) })
.directive('sideMenu', function() { .directive('sideMenu', function() {

2
js/ext/angular/src/directive/ionicTabBar.js vendored
View File

@ -152,7 +152,7 @@ angular.module('ionic.ui.tabs', ['ngAnimate'])
}; };
}, },
template: template:
'<a href="#" ng-class="{active:active}" ng-click="selectTab()" class="tab-item">' + '<a ng-class="{active:active}" ng-click="selectTab()" class="tab-item">' +
'<i ng-class="{{icon}}" ng-if="icon"></i>' + '<i ng-class="{{icon}}" ng-if="icon"></i>' +
'<i class="{{iconOn}}" ng-if="active"></i>' + '<i class="{{iconOn}}" ng-if="active"></i>' +
'<i class="{{iconOff}}" ng-if="!active"></i> {{title}}' + '<i class="{{iconOff}}" ng-if="!active"></i> {{title}}' +

2
js/ext/angular/test/directive/ionicSideMenu.unit.js
View File

@ -13,6 +13,6 @@ describe('Ionic Angular Side Menu', function() {
it('Should init', function() { it('Should init', function() {
var scope = el.scope(); var scope = el.scope();
expect(scope.sideMenuCtrl).not.toBe(undefined); expect(scope.sideMenuController).not.toBe(undefined);
}); });
}); });

60
js/ext/angular/test/navTest.html Normal file
View File

@ -0,0 +1,60 @@
<html ng-app="navTest">
<head>
<meta charset="utf-8">
<title>Nav Bars</title>
<!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="/vendor/font-awesome/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="../../../../dist/css/ionic.css">
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0/angular.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0/angular-touch.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.0/angular-animate.js"></script>
<script src="../../../../dist/js/ionic.js"></script>
<script src="../../../../dist/js/ionic-angular.js"></script>
</head>
<body>
<navs>
<nav-bar type="bar-primary" back-button-type="button-pure">
</nav-bar>
<div ng-controller="AppCtrl">
<content has-header="true">
</content>
</div>
</navs>
<script id="page.html" type="text/ng-template">
<div title="Home home" ng-controller="CatsCtrl" class="nav-content">
<h1></h1>
<button class="button button-success" ng-click="goNext()">Next</button>
<list><list-item ng-repeat="item in items" on-select="goNext()">Test</list-item></list>
</div>
</script>
<script>
angular.module('navTest', ['ionic', 'ngAnimate'])
.controller('AppCtrl', function($scope) {
$scope.navController.pushFromTemplate('page.html');
})
.controller('CatsCtrl', function($scope, $compile, $element) {
$scope.$on('navContent.shown', function() {
console.log('SHOWN');
});
$scope.$on('navContent.hidden', function() {
console.log('HIDDEN');
});
$scope.goNext = function() {
$scope.navController.pushFromTemplate('page.html');
};
});
</script>
</body>
</html>

2
js/ext/angular/test/sideMenu.html
View File

@ -63,7 +63,7 @@
}); });
} }
$scope.openLeft = function() { $scope.openLeft = function() {
$scope.sideMenuCtrl.toggleLeft(); $scope.sideMenuController.toggleLeft();
}; };
}); });
</script> </script>

8
js/ext/angular/test/tabs.html
View File

@ -51,11 +51,11 @@
<tabs <tabs
animation="fade-in-out" animation="fade-in-out"
tabs-type="tabs-icon-only" tabs-type="tabs-icon-only"
tabs-style="tabs-primary" tabs-style="tabs-positive"
controller-changed="onControllerChanged(oldController, oldIndex, newController, newIndex)"> controller-changed="onControllerChanged(oldController, oldIndex, newController, newIndex)">
<tab title="Home" icon-on="icon ion-ios7-filing" icon-off="icon ion-ios7-filing-outline" ng-controller="HomeCtrl"> <tab title="Home" icon-on="icon ion-ios7-filing" icon-off="icon ion-ios7-filing-outline" ng-controller="HomeCtrl">
<header class="bar bar-header bar-secondary"> <header class="bar bar-header bar-positive">
<button class="button button-clear button-primary" ng-click="newTask()">New</button> <button class="button button-clear button-primary" ng-click="newTask()">New</button>
<h1 class="title">Tasks</h1> <h1 class="title">Tasks</h1>
<button class="button button-clear button-primary" ng-click="isEditingItems = !isEditingItems">Edit</button> <button class="button button-clear button-primary" ng-click="isEditingItems = !isEditingItems">Edit</button>
@ -85,7 +85,7 @@
</tab> </tab>
<tab title="About" icon-on="icon ion-ios7-clock" icon-off="icon ion-ios7-clock-outline"> <tab title="About" icon-on="icon ion-ios7-clock" icon-off="icon ion-ios7-clock-outline">
<header class="bar bar-header bar-secondary"> <header class="bar bar-header bar-positive">
<h1 class="title">Deadlines</h1> <h1 class="title">Deadlines</h1>
</header> </header>
<content has-header="true" has-tabs="true"> <content has-header="true" has-tabs="true">
@ -94,7 +94,7 @@
</tab> </tab>
<tab title="Settings" icon-on="icon ion-ios7-gear" icon-off="icon ion-ios7-gear-outline"> <tab title="Settings" icon-on="icon ion-ios7-gear" icon-off="icon ion-ios7-gear-outline">
<header class="bar bar-header bar-secondary"> <header class="bar bar-header bar-positive">
<h1 class="title">Settings</h1> <h1 class="title">Settings</h1>
</header> </header>
<content has-header="true" has-tabs="true"> <content has-header="true" has-tabs="true">