Skip to content
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

Jump to bottom

UI-Router detection #277

Merged
merged 3 commits into from
Jul 14, 2015
Merged

UI-Router detection #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed5b769
add ui-router detection and dynamic event name
skelet00r Jul 14, 2015
8268f78
add working example page
skelet00r Jul 14, 2015
0831e25
fixed style guide issue
skelet00r Jul 14, 2015
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
121 changes: 121 additions & 0 deletions example/browser-back-button/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
<!doctype html>
<html ng-app="backButtonDemo">
<head>
<meta charset="utf-8">
<title>ngDialog demo</title>
<link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="../../css/ngDialog.css">
<link rel="stylesheet" href="../../css/ngDialog-theme-default.css">
<link rel="stylesheet" href="../../css/ngDialog-theme-plain.css">
<link rel="stylesheet" href="../../css/ngDialog-custom-width.css">

<style>
a, button {
font: 14px 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
display: block;
color: #333;
margin-bottom: 10px;
}

/* The following 'important' styles are just here to show off trapFocus */
button.ngdialog-button {
border: solid transparent 1px !important;
}

button.ngdialog-button:focus {
border: solid black 1px !important;
}

.ngdialog h2:focus { outline: none; }
</style>
</head>
<body>

<ui-view />

<!-- Templates -->

<script type="text/ng-template" id="home.html">
<h1> Home Page </h1>
<h1> Navigate to the about page </h1>
<button ui-sref="about"> ABOUT PAGE </button>
</script>

<script type="text/ng-template" id="about.html">
<h1> About Page </h1>
<p> {{ text }} </p>
<button ui-sref="home"> HOME PAGE </button>
</script>

<script type="text/ng-template" id="resolveDialog">
Sup?
<div class="ngdialog-buttons">
<button class="ngdialog-button ngdialog-button-primary" ng-click="confirm()"> Continue </button>
<button class="ngdialog-button ngdialog-button-primary" ng-click="closeThisDialog()"> Go Back </button>
</div>
</script>

<!-- Scripts -->
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.0/angular.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.15/angular-ui-router.min.js"></script>
<script>window.angular || document.write('<script src="../../bower_components/angular/angular.min.js">\x3C/script>')</script>
<script src="../../js/ngDialog.js"></script>

<!-- App -->
<script>
angular.module('backButtonDemo', ['ngDialog', 'ui.router'])

.config(function($urlMatcherFactoryProvider, $stateProvider){
$urlMatcherFactoryProvider.strictMode(false);
$stateProvider.state('home',
{
url: '',
templateUrl: 'home.html'
})
.state('about',
{
url: '/about',
templateUrl: 'about.html',
controller: 'mainController',
resolve: {
'RESOLVE_DATA' : function($q) {
var defer = $q.defer();
setTimeout(function() {
defer.resolve('the data for this page resolves after 1ms');
}, 1);
return defer.promise;
}
}
});
})

.run(function($rootScope) {
$rootScope.$on('$locationChangeSuccess', function(){
console.log('$locationChangeSuccess event fired');
});
$rootScope.$on('$stateChangeSuccess', function(){
console.log('$stateChangeSuccess event fired');
});
})

.controller('mainController', function($scope, RESOLVE_DATA, ngDialog, $state){
$scope.text = RESOLVE_DATA;

ngDialog.openConfirm({
template: 'resolveDialog',
className: 'ngdialog-theme-default',
scope: $scope,
closeByDocument: false,
closeByEscape: false,
showClose: false,
closeByNavigation: true
}).then(function(value) {
return value;
}, function(reason) {
$state.go('home');
return reason;
});
});
</script>
</body>
</html>
23 changes: 21 additions & 2 deletions js/ngDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
function ($document, $templateCache, $compile, $q, $http, $rootScope, $timeout, $window, $controller, $injector) {
var $body = $document.find('body');
if (forceBodyReload) {
$rootScope.$on('$locationChangeSuccess', function () {
var eventName = privateMethods.getRouterLocationEventName();
$rootScope.$on(eventName, function () {
$body = $document.find('body');
});
}
Expand Down Expand Up @@ -394,6 +395,23 @@

return generatedId;
}
},

detectUIRouter: function() {
//Detect if ui-router module is installed if not return false
try {
angular.module("ui.router");
return true;
} catch(err) {
return false;
}
},

getRouterLocationEventName: function() {
if(privateMethods.detectUIRouter()) {
return '$stateChangeSuccess';
}
return '$locationChangeSuccess';
}
};

Expand Down Expand Up @@ -561,7 +579,8 @@
}

if (options.closeByNavigation) {
$rootScope.$on('$locationChangeSuccess', function () {
var eventName = privateMethods.getRouterLocationEventName();
$rootScope.$on(eventName, function () {
privateMethods.closeDialog($dialog);
});
}
Expand Down