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

Schtuff

Browse Source
This commit is contained in:
Max Lynch
2013-11-14 00:19:42 -06:00
parent 22d10a155e
commit e20782d0c8
5 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Gruntfile.js
View File

@ -48,11 +48,11 @@ module.exports = function(grunt) {
}, },
distAngular: { distAngular: {
src: [ src: [
'vendor/angular/1.2.0/angular.min.js', 'vendor/angular/1.2.0/angular.js',
'vendor/angular/1.2.0/angular-animate.min.js', 'vendor/angular/1.2.0/angular-animate.js',
'vendor/angular/1.2.0/angular-resource.min.js', 'vendor/angular/1.2.0/angular-resource.js',
'vendor/angular/1.2.0/angular-sanitize.min.js', 'vendor/angular/1.2.0/angular-sanitize.js',
'vendor/angular/1.2.0/angular-touch.min.js', 'vendor/angular/1.2.0/angular-touch.js',
'js/ext/angular/src/ionicAngular.js', 'js/ext/angular/src/ionicAngular.js',
'js/ext/angular/src/service/**/*.js', 'js/ext/angular/src/service/**/*.js',
'js/ext/angular/src/directive/**/*.js' 'js/ext/angular/src/directive/**/*.js'

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

@ -1009,7 +1009,7 @@ angular.module('ionic.ui.list', ['ngAnimate'])
buttons: '=', buttons: '=',
type: '@' type: '@'
}, },
template: '<a href="#" class="item">\ template: '<li class="item">\
<div class="item-edit" ng-if="canDelete && isEditing">\ <div class="item-edit" ng-if="canDelete && isEditing">\
<button class="button button-icon" ng-click="onDelete()"><i ng-class="deleteIcon"></i></button>\ <button class="button button-icon" ng-click="onDelete()"><i ng-class="deleteIcon"></i></button>\
</div>\ </div>\
@ -1021,7 +1021,7 @@ angular.module('ionic.ui.list', ['ngAnimate'])
<div class="item-options" ng-if="canSwipe && !isEditing && showOptions">\ <div class="item-options" ng-if="canSwipe && !isEditing && showOptions">\
<button ng-click="buttonClicked(button)" class="button" ng-class="button.type" ng-repeat="button in buttons">{{button.text}}</button>\ <button ng-click="buttonClicked(button)" class="button" ng-class="button.type" ng-repeat="button in buttons">{{button.text}}</button>\
</div>\ </div>\
</a>', </li>',
link: function($scope, $element, $attr, list) { link: function($scope, $element, $attr, list) {
// Grab the parent list controller // Grab the parent list controller
@ -1620,23 +1620,23 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
return function($scope, $element, $attr, sideMenuCtrl) { return function($scope, $element, $attr, sideMenuCtrl) {
$scope.side = $attr.side; $scope.side = $attr.side;
if($scope.side == 'left') {
sideMenuCtrl.left.isEnabled = true;
sideMenuCtrl.left.pushDown = function() { sideMenuCtrl.left.pushDown = function() {
$element[0].style.zIndex = -1; $element[0].style.zIndex = -1;
}; };
sideMenuCtrl.left.bringUp = function() { sideMenuCtrl.left.bringUp = function() {
$element[0].style.zIndex = 0; $element[0].style.zIndex = 0;
}; };
} else if($scope.side == 'right') {
sideMenuCtrl.right.isEnabled = true;
sideMenuCtrl.right.pushDown = function() { sideMenuCtrl.right.pushDown = function() {
$element[0].style.zIndex = -1; $element[0].style.zIndex = -1;
}; };
sideMenuCtrl.right.bringUp = function() { sideMenuCtrl.right.bringUp = function() {
$element[0].style.zIndex = 0; $element[0].style.zIndex = 0;
}; };
if($scope.side == 'left') {
sideMenuCtrl.left.isEnabled = true;
} else if($scope.side == 'right') {
sideMenuCtrl.right.isEnabled = true;
} }
$element.append(transclude($scope)); $element.append(transclude($scope));

4
js/ext/angular/src/directive/ionicList.js vendored
View File

@ -19,7 +19,7 @@ angular.module('ionic.ui.list', ['ngAnimate'])
buttons: '=', buttons: '=',
type: '@' type: '@'
}, },
template: '<a href="#" class="item">\ template: '<li class="item">\
<div class="item-edit" ng-if="canDelete && isEditing">\ <div class="item-edit" ng-if="canDelete && isEditing">\
<button class="button button-icon" ng-click="onDelete()"><i ng-class="deleteIcon"></i></button>\ <button class="button button-icon" ng-click="onDelete()"><i ng-class="deleteIcon"></i></button>\
</div>\ </div>\
@ -31,7 +31,7 @@ angular.module('ionic.ui.list', ['ngAnimate'])
<div class="item-options" ng-if="canSwipe && !isEditing && showOptions">\ <div class="item-options" ng-if="canSwipe && !isEditing && showOptions">\
<button ng-click="buttonClicked(button)" class="button" ng-class="button.type" ng-repeat="button in buttons">{{button.text}}</button>\ <button ng-click="buttonClicked(button)" class="button" ng-class="button.type" ng-repeat="button in buttons">{{button.text}}</button>\
</div>\ </div>\
</a>', </li>',
link: function($scope, $element, $attr, list) { link: function($scope, $element, $attr, list) {
// Grab the parent list controller // Grab the parent list controller

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

@ -126,23 +126,23 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
return function($scope, $element, $attr, sideMenuCtrl) { return function($scope, $element, $attr, sideMenuCtrl) {
$scope.side = $attr.side; $scope.side = $attr.side;
if($scope.side == 'left') {
sideMenuCtrl.left.isEnabled = true;
sideMenuCtrl.left.pushDown = function() { sideMenuCtrl.left.pushDown = function() {
$element[0].style.zIndex = -1; $element[0].style.zIndex = -1;
}; };
sideMenuCtrl.left.bringUp = function() { sideMenuCtrl.left.bringUp = function() {
$element[0].style.zIndex = 0; $element[0].style.zIndex = 0;
}; };
} else if($scope.side == 'right') {
sideMenuCtrl.right.isEnabled = true;
sideMenuCtrl.right.pushDown = function() { sideMenuCtrl.right.pushDown = function() {
$element[0].style.zIndex = -1; $element[0].style.zIndex = -1;
}; };
sideMenuCtrl.right.bringUp = function() { sideMenuCtrl.right.bringUp = function() {
$element[0].style.zIndex = 0; $element[0].style.zIndex = 0;
}; };
if($scope.side == 'left') {
sideMenuCtrl.left.isEnabled = true;
} else if($scope.side == 'right') {
sideMenuCtrl.right.isEnabled = true;
} }
$element.append(transclude($scope)); $element.append(transclude($scope));

3
test/actionsheet.html
View File

@ -5,8 +5,7 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="../dist/ionicons.css" rel="stylesheet"> <link href="../dist/css/ionic.css" rel="stylesheet">
<link href="../dist/ionic.css" rel="stylesheet">
</head> </head>
<body> <body>