mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-11-06 22:29:44 +08:00
Action sheet working
This commit is contained in:
80
dist/ionic-angular.js
vendored
80
dist/ionic-angular.js
vendored
@ -1,5 +1,56 @@
|
||||
angular.module('ionic.ui', ['ionic.ui.content', 'ionic.ui.tabs', 'ionic.ui.nav', 'ionic.ui.sideMenu']);
|
||||
;
|
||||
angular.module('ionic.service.actionSheet', ['ionic.service', 'ionic.ui.actionSheet'])
|
||||
|
||||
.factory('ActionSheet', ['$rootScope', '$document', '$compile', 'TemplateLoader', function($rootScope, $document, $compile, TemplateLoader) {
|
||||
return {
|
||||
/**
|
||||
* Load an action sheet with the given template string.
|
||||
*
|
||||
* A new isolated scope will be created for the
|
||||
* action sheet and the new element will be appended into the body.
|
||||
*
|
||||
* @param {object} opts the options for this ActionSheet (see docs)
|
||||
*/
|
||||
show: function(opts) {
|
||||
var scope = $rootScope.$new(true);
|
||||
|
||||
angular.extend(scope, opts);
|
||||
|
||||
scope.cancel = function() {
|
||||
scope.$destroy();
|
||||
opts.cancel();
|
||||
}
|
||||
|
||||
scope.buttonClicked = function(index) {
|
||||
// Check if the button click event returned true, which means
|
||||
// we can close the action sheet
|
||||
if((opts.buttonClicked && opts.buttonClicked(index)) === true) {
|
||||
scope.$destroy();
|
||||
}
|
||||
};
|
||||
|
||||
scope.destructiveButtonClicked = function() {
|
||||
// Check if the destructive button click event returned true, which means
|
||||
// we can close the action sheet
|
||||
if((opts.destructiveButtonClicked && opts.destructiveButtonClicked()) === true) {
|
||||
scope.$destroy();
|
||||
}
|
||||
}
|
||||
|
||||
// Compile the template
|
||||
var element = $compile('<action-sheet buttons="buttons"></action-sheet>')(scope);
|
||||
|
||||
var scope = element.scope();
|
||||
|
||||
$document[0].body.appendChild(element[0]);
|
||||
|
||||
var sheet = ionic.views.ActionSheet({el: element[0] });
|
||||
scope.sheet = sheet;
|
||||
return sheet;
|
||||
}
|
||||
};
|
||||
}]);
|
||||
;
|
||||
;
|
||||
angular.module('ionic.service.modal', ['ionic.service'])
|
||||
@ -59,7 +110,34 @@ angular.module('ionic.service', [])
|
||||
}
|
||||
}]);
|
||||
;
|
||||
angular.module('ionic.ui.content', {})
|
||||
angular.module('ionic.ui.actionSheet', [])
|
||||
|
||||
.directive('actionSheet', function() {
|
||||
return {
|
||||
restrict: 'E',
|
||||
scope: true,
|
||||
replace: true,
|
||||
link: function($scope, $element){
|
||||
$scope.$on('$destroy', function() {
|
||||
$element.remove();
|
||||
});
|
||||
},
|
||||
template: '<div class="action-sheet">' +
|
||||
'<div class="action-sheet-group">' +
|
||||
'<div class="action-sheet-title" ng-if="titleText">{{titleText}}</div>' +
|
||||
'<button class="button" ng-click="buttonClicked($index)" ng-repeat="button in buttons">{{button.text}}</button>' +
|
||||
'</div>' +
|
||||
'<div class="action-sheet-group" ng-if="destructiveText">' +
|
||||
'<button class="button destructive" ng-click="destructiveButtonClicked()">{{destructiveText}}</button>' +
|
||||
'</div>' +
|
||||
'<div class="action-sheet-group" ng-if="cancelText">' +
|
||||
'<button class="button" ng-click="cancel()">{{cancelText}}</button>' +
|
||||
'</div>' +
|
||||
'</div>'
|
||||
}
|
||||
});
|
||||
;
|
||||
angular.module('ionic.ui.content', [])
|
||||
|
||||
// The content directive is a core scrollable content area
|
||||
// that is part of many View hierarchies
|
||||
|
||||
28
dist/ionic.css
vendored
28
dist/ionic.css
vendored
@ -1166,6 +1166,34 @@ address {
|
||||
font-style: normal;
|
||||
line-height: 1.42857; }
|
||||
|
||||
.action-sheet {
|
||||
position: fixed;
|
||||
z-index: 10;
|
||||
width: calc(100% - 30px);
|
||||
bottom: 0;
|
||||
left: 15px;
|
||||
overflow: hidden; }
|
||||
.action-sheet .button {
|
||||
display: block;
|
||||
width: 100%;
|
||||
padding: 10px;
|
||||
border-radius: none;
|
||||
background-color: transparent;
|
||||
font-size: 18px;
|
||||
color: #4a87ee; }
|
||||
.action-sheet .button.destructive {
|
||||
color: #ef4e3a; }
|
||||
|
||||
.action-sheet-title {
|
||||
font-size: 12px;
|
||||
padding: 10px;
|
||||
text-align: center; }
|
||||
|
||||
.action-sheet-group {
|
||||
border-radius: 3px;
|
||||
background-color: rgba(255, 255, 255, 0.95);
|
||||
margin-bottom: 10px; }
|
||||
|
||||
.bar {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
|
||||
22
dist/ionic.js
vendored
22
dist/ionic.js
vendored
@ -1730,6 +1730,28 @@ window.ionic = {
|
||||
}
|
||||
})(window.ionic);
|
||||
;
|
||||
(function(ionic) {
|
||||
/**
|
||||
* An ActionSheet is the slide up menu popularized on iOS.
|
||||
*
|
||||
* You see it all over iOS apps, where it offers a set of options
|
||||
* triggered after an action.
|
||||
*/
|
||||
ionic.views.ActionSheet = function(opts) {
|
||||
this.el = opts.el;
|
||||
};
|
||||
|
||||
ionic.views.ActionSheet.prototype = {
|
||||
show: function() {
|
||||
this.el.classList.add('active');
|
||||
},
|
||||
hide: function() {
|
||||
this.el.classList.remove('active');
|
||||
}
|
||||
};
|
||||
|
||||
})(ionic);
|
||||
;
|
||||
|
||||
(function(ionic) {
|
||||
|
||||
|
||||
@ -2,10 +2,16 @@ angular.module('ionic.todo', [
|
||||
'ionic.todo.services',
|
||||
'ionic.todo.controllers',
|
||||
|
||||
'ionic.service.modal',
|
||||
'ionic.service.actionSheet',
|
||||
|
||||
'ionic.ui.nav',
|
||||
'ionic.ui.sideMenu',
|
||||
'ionic.ui.actionSheet',
|
||||
|
||||
'firebase', 'ngRoute', 'ngAnimate'])
|
||||
'firebase',
|
||||
'ngRoute',
|
||||
'ngAnimate'])
|
||||
|
||||
// Our Firebase URL
|
||||
.constant('FIREBASE_URL', 'https://ionic-todo-demo.firebaseio.com/');
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
angular.module('ionic.todo.controllers', ['ionic.todo', 'ionic.service.modal', 'firebase'])
|
||||
angular.module('ionic.todo.controllers', ['ionic.todo'])
|
||||
|
||||
// The main controller for the application
|
||||
.controller('TodoCtrl', function($scope, $rootScope, AuthService) {
|
||||
@ -45,7 +45,7 @@ angular.module('ionic.todo.controllers', ['ionic.todo', 'ionic.service.modal', '
|
||||
})
|
||||
|
||||
// The signup form controller
|
||||
.controller('SignupCtrl', function($scope, AuthService, Modal) {
|
||||
.controller('SignupCtrl', function($scope, AuthService, Modal, ActionSheet) {
|
||||
$scope.signupForm = {};
|
||||
|
||||
Modal.fromTemplateUrl('login.html', function(modal) {
|
||||
@ -57,7 +57,27 @@ angular.module('ionic.todo.controllers', ['ionic.todo', 'ionic.service.modal', '
|
||||
};
|
||||
|
||||
$scope.showLogin = function() {
|
||||
$scope.loginModal && $scope.loginModal.show();
|
||||
//$scope.loginModal && $scope.loginModal.show();
|
||||
ActionSheet.show({
|
||||
buttons: [
|
||||
{ text: 'Option 1' },
|
||||
{ text: 'Option 2' },
|
||||
{ text: 'Option 3' },
|
||||
],
|
||||
destructiveText: 'Delete life',
|
||||
titleText: 'Are you sure about life?',
|
||||
cancelText: 'Cancel',
|
||||
cancel: function() {
|
||||
console.log('CANCELLED');
|
||||
},
|
||||
buttonClicked: function(index) {
|
||||
console.log('BUTTON CLICKED', index);
|
||||
return true;
|
||||
},
|
||||
destructiveButtonClicked: function() {
|
||||
return true;
|
||||
}
|
||||
});
|
||||
};
|
||||
})
|
||||
|
||||
|
||||
26
js/ext/angular/src/directive/ionicActionSheet.js
vendored
Normal file
26
js/ext/angular/src/directive/ionicActionSheet.js
vendored
Normal file
@ -0,0 +1,26 @@
|
||||
angular.module('ionic.ui.actionSheet', [])
|
||||
|
||||
.directive('actionSheet', function() {
|
||||
return {
|
||||
restrict: 'E',
|
||||
scope: true,
|
||||
replace: true,
|
||||
link: function($scope, $element){
|
||||
$scope.$on('$destroy', function() {
|
||||
$element.remove();
|
||||
});
|
||||
},
|
||||
template: '<div class="action-sheet">' +
|
||||
'<div class="action-sheet-group">' +
|
||||
'<div class="action-sheet-title" ng-if="titleText">{{titleText}}</div>' +
|
||||
'<button class="button" ng-click="buttonClicked($index)" ng-repeat="button in buttons">{{button.text}}</button>' +
|
||||
'</div>' +
|
||||
'<div class="action-sheet-group" ng-if="destructiveText">' +
|
||||
'<button class="button destructive" ng-click="destructiveButtonClicked()">{{destructiveText}}</button>' +
|
||||
'</div>' +
|
||||
'<div class="action-sheet-group" ng-if="cancelText">' +
|
||||
'<button class="button" ng-click="cancel()">{{cancelText}}</button>' +
|
||||
'</div>' +
|
||||
'</div>'
|
||||
}
|
||||
});
|
||||
2
js/ext/angular/src/directive/ionicContent.js
vendored
2
js/ext/angular/src/directive/ionicContent.js
vendored
@ -1,4 +1,4 @@
|
||||
angular.module('ionic.ui.content', {})
|
||||
angular.module('ionic.ui.content', [])
|
||||
|
||||
// The content directive is a core scrollable content area
|
||||
// that is part of many View hierarchies
|
||||
|
||||
51
js/ext/angular/src/service/ionicActionSheet.js
vendored
51
js/ext/angular/src/service/ionicActionSheet.js
vendored
@ -0,0 +1,51 @@
|
||||
angular.module('ionic.service.actionSheet', ['ionic.service', 'ionic.ui.actionSheet'])
|
||||
|
||||
.factory('ActionSheet', ['$rootScope', '$document', '$compile', 'TemplateLoader', function($rootScope, $document, $compile, TemplateLoader) {
|
||||
return {
|
||||
/**
|
||||
* Load an action sheet with the given template string.
|
||||
*
|
||||
* A new isolated scope will be created for the
|
||||
* action sheet and the new element will be appended into the body.
|
||||
*
|
||||
* @param {object} opts the options for this ActionSheet (see docs)
|
||||
*/
|
||||
show: function(opts) {
|
||||
var scope = $rootScope.$new(true);
|
||||
|
||||
angular.extend(scope, opts);
|
||||
|
||||
scope.cancel = function() {
|
||||
scope.$destroy();
|
||||
opts.cancel();
|
||||
}
|
||||
|
||||
scope.buttonClicked = function(index) {
|
||||
// Check if the button click event returned true, which means
|
||||
// we can close the action sheet
|
||||
if((opts.buttonClicked && opts.buttonClicked(index)) === true) {
|
||||
scope.$destroy();
|
||||
}
|
||||
};
|
||||
|
||||
scope.destructiveButtonClicked = function() {
|
||||
// Check if the destructive button click event returned true, which means
|
||||
// we can close the action sheet
|
||||
if((opts.destructiveButtonClicked && opts.destructiveButtonClicked()) === true) {
|
||||
scope.$destroy();
|
||||
}
|
||||
}
|
||||
|
||||
// Compile the template
|
||||
var element = $compile('<action-sheet buttons="buttons"></action-sheet>')(scope);
|
||||
|
||||
var scope = element.scope();
|
||||
|
||||
$document[0].body.appendChild(element[0]);
|
||||
|
||||
var sheet = ionic.views.ActionSheet({el: element[0] });
|
||||
scope.sheet = sheet;
|
||||
return sheet;
|
||||
}
|
||||
};
|
||||
}]);
|
||||
|
||||
@ -1,2 +0,0 @@
|
||||
<div class="full-section">
|
||||
</div>
|
||||
@ -1,12 +0,0 @@
|
||||
<footer class="bar bar-tabs bar-footer bar-success">
|
||||
<nav id="tab-bar" class="tabs">
|
||||
<ul class="tabs-inner">
|
||||
<li class="tab-item" ng-repeat="tab in tabs">
|
||||
<a href="#">
|
||||
<i class="{{tab.icon}}"></i>
|
||||
{{tab.text}}
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</nav>
|
||||
</footer>
|
||||
21
js/views/actionSheetView.js
Normal file
21
js/views/actionSheetView.js
Normal file
@ -0,0 +1,21 @@
|
||||
(function(ionic) {
|
||||
/**
|
||||
* An ActionSheet is the slide up menu popularized on iOS.
|
||||
*
|
||||
* You see it all over iOS apps, where it offers a set of options
|
||||
* triggered after an action.
|
||||
*/
|
||||
ionic.views.ActionSheet = function(opts) {
|
||||
this.el = opts.el;
|
||||
};
|
||||
|
||||
ionic.views.ActionSheet.prototype = {
|
||||
show: function() {
|
||||
this.el.classList.add('active');
|
||||
},
|
||||
hide: function() {
|
||||
this.el.classList.remove('active');
|
||||
}
|
||||
};
|
||||
|
||||
})(ionic);
|
||||
40
scss/ionic/_actionSheet.scss
Normal file
40
scss/ionic/_actionSheet.scss
Normal file
@ -0,0 +1,40 @@
|
||||
.action-sheet {
|
||||
position: fixed;
|
||||
|
||||
z-index: $zindex-modal;
|
||||
|
||||
width: calc(100% - 30px);
|
||||
|
||||
bottom: 0;
|
||||
left: 15px;
|
||||
|
||||
overflow: hidden;
|
||||
|
||||
|
||||
.button {
|
||||
display: block;
|
||||
width: 100%;
|
||||
padding: 10px;
|
||||
border-radius: none;
|
||||
background-color: transparent;
|
||||
font-size: 18px;
|
||||
|
||||
color: $brand-primary;
|
||||
|
||||
&.destructive {
|
||||
color: $brand-danger;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.action-sheet-title {
|
||||
font-size: 12px;
|
||||
padding: 10px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.action-sheet-group {
|
||||
border-radius: $sheet-border-radius;
|
||||
background-color: rgba($sheet-bg-color, $sheet-opacity);
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
@ -16,7 +16,6 @@
|
||||
|
||||
background-color: $modal-bg-color;
|
||||
|
||||
|
||||
// Active modal
|
||||
&.active {
|
||||
height: 100%;
|
||||
|
||||
@ -361,6 +361,11 @@ $menu-animation-speed: 200ms;
|
||||
|
||||
$modal-bg-color: #fff !default;
|
||||
|
||||
// Action Sheets
|
||||
// -------------------------------
|
||||
$sheet-bg-color: rgba(255, 255, 255, 0.6) !default;
|
||||
$sheet-opacity: 0.95 !default;
|
||||
$sheet-border-radius: 3px !default;
|
||||
|
||||
// Badges
|
||||
// -------------------------
|
||||
|
||||
@ -14,6 +14,9 @@
|
||||
"grid",
|
||||
"type",
|
||||
|
||||
// Action Sheet
|
||||
"actionSheet",
|
||||
|
||||
// Nav
|
||||
"bar",
|
||||
"tabs",
|
||||
|
||||
Reference in New Issue
Block a user