diff options
Diffstat (limited to 'www/js/WizardCtrl.js')
| -rw-r--r-- | www/js/WizardCtrl.js | 606 |
1 files changed, 303 insertions, 303 deletions
diff --git a/www/js/WizardCtrl.js b/www/js/WizardCtrl.js index a0cc975d..b36cf668 100644 --- a/www/js/WizardCtrl.js +++ b/www/js/WizardCtrl.js @@ -2,7 +2,7 @@ /* jslint browser: true*/ /* global cordova,StatusBar,angular,console, Masonry, URI */ -angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$rootScope', '$ionicModal', 'ZMDataModel', '$ionicSideMenuDelegate', '$ionicHistory', '$state', '$ionicPopup', 'SecuredPopups', '$http', '$q', 'zm','$ionicLoading', 'WizardHandler','$translate', function ($scope, $rootScope, $ionicModal, ZMDataModel, $ionicSideMenuDelegate, $ionicHistory, $state, $ionicPopup, SecuredPopups, $http, $q, zm, $ionicLoading, WizardHandler, $translate) { +angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$rootScope', '$ionicModal', 'ZMDataModel', '$ionicSideMenuDelegate', '$ionicHistory', '$state', '$ionicPopup', 'SecuredPopups', '$http', '$q', 'zm', '$ionicLoading', 'WizardHandler', '$translate', function ($scope, $rootScope, $ionicModal, ZMDataModel, $ionicSideMenuDelegate, $ionicHistory, $state, $ionicPopup, SecuredPopups, $http, $q, zm, $ionicLoading, WizardHandler, $translate) { $scope.openMenu = function () { $ionicSideMenuDelegate.toggleLeft(); }; @@ -11,7 +11,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ //-------------------------------------------------------------------------- // logs into ZM //-------------------------------------------------------------------------- - + function login(u, zmu, zmp) { var d = $q.defer(); @@ -41,11 +41,11 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ }) .success(function (data, status, headers) { console.log("LOOKING FOR " + zm.loginScreenString); - console.log ("DATA RECEIVED " + JSON.stringify(data)); + console.log("DATA RECEIVED " + JSON.stringify(data)); if (data.indexOf(zm.loginScreenString) == -1) { - + $scope.wizard.loginURL = $scope.wizard.fqportal; - $scope.wizard.portalValidText = $translate.instant('kPortal')+": "+$scope.wizard.loginURL; + $scope.wizard.portalValidText = $translate.instant('kPortal') + ": " + $scope.wizard.loginURL; $scope.wizard.portalColor = "#16a085"; d.resolve(true); return d.promise; @@ -57,96 +57,87 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ return d.promise; } }) - .error (function (error) { - console.log("************ERROR"); - $scope.wizard.portalValidText = $translate.instant('kPortalDetectionFailed'); - $scope.wizard.portalColor = "#e74c3c"; - d.reject(false); - return d.promise; - - }); + .error(function (error) { + console.log("************ERROR"); + $scope.wizard.portalValidText = $translate.instant('kPortalDetectionFailed'); + $scope.wizard.portalColor = "#e74c3c"; + d.reject(false); + return d.promise; + + }); return d.promise; } - + //-------------------------------------------------------------------------- // we need a monitor ID to do cgi-bin detection - if you don't have // monitors configured, cgi-bin won't work //-------------------------------------------------------------------------- - - function getFirstMonitor() - { - var d=$q.defer(); $http.get($scope.wizard.apiURL+"/monitors.json") - .then (function (success) { - if (success.data.monitors.length > 0) - { - var foundMid = -1; - for (var i=0; i< success.data.monitors.length; i++) - { - if ( success.data.monitors[i].Monitor.Function != 'None' && - success.data.monitors[i].Monitor.Enabled == '1') - { - foundMid = success.data.monitors[i].Monitor.Id; - break; + + function getFirstMonitor() { + var d = $q.defer(); + $http.get($scope.wizard.apiURL + "/monitors.json") + .then(function (success) { + console.log("getfirst monitor success: " + JSON.stringify(success)); + if (success.data.monitors.length > 0) { + var foundMid = -1; + for (var i = 0; i < success.data.monitors.length; i++) { + if (success.data.monitors[i].Monitor.Function != 'None' && + success.data.monitors[i].Monitor.Enabled == '1') { + foundMid = success.data.monitors[i].Monitor.Id; + break; + } + } + + if (foundMid != -1) { + ZMDataModel.zmDebug("zmWizard - getFirstMonitor returned " + foundMid); + d.resolve(foundMid); + return d.promise; + } else { + d.reject(false); + return d.promise; + } + + + + } else { + d.reject(false); + return d.promise; } - } - - if (foundMid != -1) - { - ZMDataModel.zmDebug("zmWizard - getFirstMonitor returned " + foundMid); d.resolve(foundMid); - return d.promise; - } - else - { + }, + function (error) { + console.log("getfirst monitor error: " + JSON.stringify(error)); d.reject(false); return d.promise; - } - - - - } - else - { - d.reject(false); - return d.promise; - } - }, - function (error) { - d.reject(false); - return d.promise; - }); + }); return d.promise; } - + //-------------------------------------------------------------------------- // Utility function - iterates through a list of URLs // Don't put loginData.reachability here --> we are using this to iterate // through multiple options - not the same as fallback //-------------------------------------------------------------------------- - - function findFirstReachableUrl(urls, tail) - { + + function findFirstReachableUrl(urls, tail) { var d = $q.defer(); - if (urls.length > 0) - { + if (urls.length > 0) { var t = ""; if (tail) t = tail; - //$ionicLoading.show({template: 'trying ' + urls[0].server}); - ZMDataModel.zmLog ("zmWizard test.." + urls[0]+t); - return $http.get(urls[0]+t).then(function () { - ZMDataModel.zmLog ("Success: on "+ urls[0]+t); + //$ionicLoading.show({template: 'trying ' + urls[0].server}); + ZMDataModel.zmLog("zmWizard test.." + urls[0] + t); + return $http.get(urls[0] + t).then(function () { + ZMDataModel.zmLog("Success: on " + urls[0] + t); //$ionicLoading.hide(); return urls[0]; - }, function(err) { - ZMDataModel.zmLog ("zmWizard:Failed on "+ urls[0]+t+ " with error " + JSON.stringify(err)); - return findFirstReachableUrl(urls.slice(1),tail); + }, function (err) { + ZMDataModel.zmLog("zmWizard:Failed on " + urls[0] + t + " with error " + JSON.stringify(err)); + return findFirstReachableUrl(urls.slice(1), tail); }); - } - else - { - // $ionicLoading.hide(); - ZMDataModel.zmLog ("zmWizard: findFirst returned no success"); + } else { + // $ionicLoading.hide(); + ZMDataModel.zmLog("zmWizard: findFirst returned no success"); d.reject("No reachable URL"); return d.promise; @@ -155,202 +146,195 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ return d.promise; } - + //-------------------------------------------------------------------------- // removes proto scheme from string //-------------------------------------------------------------------------- - - function stripProto(u) - { - if (u.indexOf('://')!=-1) - return u.substr(u.indexOf('://')+3); + + function stripProto(u) { + if (u.indexOf('://') != -1) + return u.substr(u.indexOf('://') + 3); else return u; } - + //-------------------------------------------------------------------------- // tries to detect cgi-bin //-------------------------------------------------------------------------- - - function detectcgi() - { + + function detectcgi() { var d = $q.defer(); var c = URI.parse($scope.wizard.loginURL); - var p1,p2; - p1 =""; - p2 =""; - + var p1, p2; + p1 = ""; + p2 = ""; + if (c.userinfo) - p1 = c.userinfo+"@"; + p1 = c.userinfo + "@"; if (c.port) - p2 = ":"+c.port; - - var baseUri = c.scheme+"://"+p1+c.host+p2; - - ZMDataModel.zmLog ("zmWizard CGI: baseURL is " +baseUri); - - var a3 = baseUri+"/zm/cgi-bin"; // ubuntu/debian - var a2 = baseUri+"/cgi-bin-zm"; //fedora/centos/rhel - var a1 = baseUri+"/cgi-bin"; // doofus - - - var urls = [a1,a2,a3]; - - + p2 = ":" + c.port; + + var baseUri = c.scheme + "://" + p1 + c.host + p2; + + ZMDataModel.zmLog("zmWizard CGI: baseURL is " + baseUri); + + var a4 = baseUri + "/cgi-bin/zm"; // another one I found with a CentOS 6 guy + var a3 = baseUri + "/zm/cgi-bin"; // ubuntu/debian + var a2 = baseUri + "/cgi-bin-zm"; //fedora/centos/rhel + var a1 = baseUri + "/cgi-bin"; // doofus + + + var urls = [a1, a2, a3, a4]; + + ZMDataModel.getPathZms() // what does ZM have stored in PATH_ZMS? - .then (function(data){ - // remove zms or nph-zms - var path = data.trim(); - path = path.replace("/nph-zms",""); - path = path.replace("/zms",""); - urls.push (baseUri.trim()+path); - ZMDataModel.zmLog ("zmWizard: getPathZMS succeeded, adding "+baseUri+path+" to things to try"); - continueCgi(urls); - }, - function (error) { - ZMDataModel.zmLog ("zmWizard: getPathZMS failed, but continuing..."); - continueCgi(urls); - }); - + .then(function (data) { + // remove zms or nph-zms + var path = data.trim(); + path = path.replace("/nph-zms", ""); + path = path.replace("/zms", ""); + urls.push(baseUri.trim() + path); + ZMDataModel.zmLog("zmWizard: getPathZMS succeeded, adding " + baseUri + path + " to things to try"); + continueCgi(urls); + }, + function (error) { + ZMDataModel.zmLog("zmWizard: getPathZMS failed, but continuing..."); + continueCgi(urls); + }); + // Well, PATH_ZMS or not, lets call this function and brute force it - function continueCgi (urls) - { + function continueCgi(urls) { $ionicLoading.show({ - template: $translate.instant('kDiscovering')+"...", + template: $translate.instant('kDiscovering') + "...", noBackdrop: true, duration: zm.httpTimeout - }); + }); getFirstMonitor() - .then (function (success){ - $ionicLoading.hide(); - var tail = "/nph-zms?mode=single&monitor="+success; - if ($scope.wizard.useauth && $scope.wizard.usezmauth) - { - - var ck = Math.floor(Math.random() * (50000 - 10000 + 1)) + 10000; - ZMDataModel.getAuthKey(success,ck) - .then (function (success) - { - if (success=="") - { - ZMDataModel.zmLog ("getAuthKey returned null, so going user=&pwd= way"); - tail+= "&user="+$scope.wizard.zmuser+"&pass="+$scope.wizard.zmpassword; - } - else - { - tail+=success; - } - ZMDataModel.zmLog ("auth computed is : " + tail); - proceedwithCgiAfterAuth(urls,tail); - }, - function (error) - { - ZMDataModel.zmLog ("Should never come here, getAuthKey doesn't return error"); - - }); - - - //console.log ("****CDING " + tail); - } - - function proceedwithCgiAfterAuth(urls,tail) - { - - $ionicLoading.show({ - template: $translate.instant('kDiscovering')+"...", - noBackdrop: true, - duration: zm.httpTimeout - }); - - findFirstReachableUrl(urls,tail ) - .then (function (success) { + .then(function (success) { $ionicLoading.hide(); - ZMDataModel.zmLog ("Valid cgi-bin found with: " + success); - $scope.wizard.streamingURL = success; - $scope.wizard.streamingValidText = "cgi-bin: "+$scope.wizard.streamingURL; - $scope.wizard.streamingColor = "#16a085"; - d.resolve(true); - return d.promise; + var tail = "/nph-zms?mode=single&monitor=" + success; + if ($scope.wizard.useauth && $scope.wizard.usezmauth) { + + var ck = Math.floor(Math.random() * (50000 - 10000 + 1)) + 10000; + ZMDataModel.getAuthKey(success, ck) + .then(function (success) { + if (success == "") { + ZMDataModel.zmLog("getAuthKey returned null, so going user=&pwd= way"); + tail += "&user=" + $scope.wizard.zmuser + "&pass=" + $scope.wizard.zmpassword; + } else { + tail += success; + } + ZMDataModel.zmLog("auth computed is : " + tail); + proceedwithCgiAfterAuth(urls, tail); + }, + function (error) { + ZMDataModel.zmLog("Should never come here, getAuthKey doesn't return error"); + + }); + + + //console.log ("****CDING " + tail); + } else // no auth case + { + proceedwithCgiAfterAuth(urls, tail); + } + + function proceedwithCgiAfterAuth(urls, tail) { + $ionicLoading.show({ + template: $translate.instant('kDiscovering') + "...", + noBackdrop: true, + duration: zm.httpTimeout + }); + + findFirstReachableUrl(urls, tail) + .then(function (success) { + $ionicLoading.hide(); + ZMDataModel.zmLog("Valid cgi-bin found with: " + success); + $scope.wizard.streamingURL = success; + $scope.wizard.streamingValidText = "cgi-bin: " + $scope.wizard.streamingURL; + $scope.wizard.streamingColor = "#16a085"; + d.resolve(true); + return d.promise; + + }, + function (error) { + $ionicLoading.hide(); + console.log("No cgi-bin found: " + error); + $scope.wizard.streamingValidText = $translate.instant('kPortalCgiBinFailed'); + $scope.wizard.streamingColor = "#e74c3c"; + d.reject(false); + return (d.promise); + }); + } }, function (error) { $ionicLoading.hide(); - console.log ("No cgi-bin found: " + error); - $scope.wizard.streamingValidText = $translate.instant('kPortalCgiBinFailed'); + $scope.wizard.streamingValidText = $translate.instant('kPortalCgiBinFailed') + " -" + $translate.instant('kPortalNoMonitorFound'); $scope.wizard.streamingColor = "#e74c3c"; - d.reject (false); + d.reject(false); return (d.promise); + }); - } - }, - function (error){ - $ionicLoading.hide(); - $scope.wizard.streamingValidText = $translate.instant('kPortalCgiBinFailed')+" -"+$translate.instant('kPortalNoMonitorFound'); - $scope.wizard.streamingColor = "#e74c3c"; - d.reject (false); - return (d.promise); - - }); } - - // https://server/zm/cgi-bin/nph-zms?mode=single&monitor=1&user=admin&pass=cc - + + // https://server/zm/cgi-bin/nph-zms?mode=single&monitor=1&user=admin&pass=cc + return d.promise; - + } - - + + //-------------------------------------------------------------------------- // Finds an appropriate API to use //-------------------------------------------------------------------------- - - function detectapi() - { - var u = $scope.wizard.loginURL; - var d = $q.defer(); - var api1 = u+"/api" ; - var api3 = u+"/zm/api"; + + function detectapi() { + var u = $scope.wizard.loginURL; + var d = $q.defer(); + var api1 = u + "/api"; + var api3 = u + "/zm/api"; var c = URI.parse(u); - + // lets also try without the path - var api2 = c.scheme+"://"; - if (c.userinfo) api2+= c.userinfo+"@"; - api2 +=c.host; - if (c.port) api2+= ":"+c.port; - api2+="/api"; - - - + var api2 = c.scheme + "://"; + if (c.userinfo) api2 += c.userinfo + "@"; + api2 += c.host; + if (c.port) api2 += ":" + c.port; + api2 += "/api"; + + + // lets try both /zm/api and /api. What else is there? var apilist = [api1, api2, api3]; - + findFirstReachableUrl(apilist, '/host/getVersion.json') - .then (function (success) { - ZMDataModel.zmLog ("Valid API response found with:" + success); - $scope.wizard.apiURL = success; - - - - $scope.wizard.apiValidText = "API: "+$scope.wizard.apiURL; - $scope.wizard.apiColor = "#16a085"; - d.resolve(true); - return d.promise; - }, - function (error) { - console.log ("No APIs found: " + error); - $scope.wizard.apiValidText = $translate.instant('kPortalAPIFailed'); - $scope.wizard.apiColor = "#e74c3c"; - d.reject (false); - return (d.promise); - }); - + .then(function (success) { + ZMDataModel.zmLog("Valid API response found with:" + success); + $scope.wizard.apiURL = success; + + + + $scope.wizard.apiValidText = "API: " + $scope.wizard.apiURL; + $scope.wizard.apiColor = "#16a085"; + d.resolve(true); + return d.promise; + }, + function (error) { + console.log("No APIs found: " + error); + $scope.wizard.apiValidText = $translate.instant('kPortalAPIFailed'); + $scope.wizard.apiColor = "#e74c3c"; + d.reject(false); + return (d.promise); + }); + return d.promise; } - + //-------------------------------------------------------------------------- // logs out of ZM //-------------------------------------------------------------------------- - + function logout(u) { var d = $q.defer(); @@ -376,20 +360,28 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ view: "login" } }) - .then (function (success) {$rootScope.zmCookie="";console.log ("ZMlogout success, cookie removed"); d.resolve(true); return d.promise;}, function (error) {console.log ("ZMlogout success");d.resolve(true); return d.promise;}); - + .then(function (success) { + $rootScope.zmCookie = ""; + console.log("ZMlogout success, cookie removed"); + d.resolve(true); + return d.promise; + }, function (error) { + console.log("ZMlogout success"); + d.resolve(true); + return d.promise; + }); + return d.promise; } - + //-------------------------------------------------------------------------- // clears all status updates in the verify results page - if you // get back to it //-------------------------------------------------------------------------- - - $scope.enterResults = function() - { + + $scope.enterResults = function () { $scope.portalValidText = ""; $scope.apiValidateText = ""; $scope.streamingValidateText = ""; @@ -408,18 +400,18 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ $scope.wizard.apiValidText = ""; $scope.wizard.streamingValidText = ""; $scope.wizard.fqportal = ""; - $scope.wizard.loginURL= ""; - $scope.wizard.apiURL= ""; - $scope.wizard.streamingURL= ""; + $scope.wizard.loginURL = ""; + $scope.wizard.apiURL = ""; + $scope.wizard.streamingURL = ""; $scope.wizard.serverName = ""; - + var d = $q.defer(); var c = URI.parse($scope.wizard.portalurl); - + $scope.wizard.serverName = c.host; - if (c.port) - $scope.wizard.serverName += "-"+c.port; + if (c.port) + $scope.wizard.serverName += "-" + c.port; var b = ""; if ($scope.wizard.useauth && $scope.wizard.usebasicauth) { @@ -454,68 +446,68 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ // use it even after logging in ZMDataModel.zmLog("zmWizard: logging out"); $ionicLoading.show({ - template: $translate.instant('kCleaningUp')+"...", - noBackdrop: true, - duration: zm.httpTimeout - }); + template: $translate.instant('kCleaningUp') + "...", + noBackdrop: true, + duration: zm.httpTimeout + }); logout(u) .then(function (ans) { // login now $ionicLoading.hide(); ZMDataModel.zmLog("zmWizard: logging in with " + u + " " + zmu + ":" + zmp); - + // The logic will be: // Login then do an api detect and cgi-detect together $ionicLoading.show({ - template: $translate.instant('kDiscoveringPortal')+"...", - noBackdrop: true, - duration: zm.httpTimeout + template: $translate.instant('kDiscoveringPortal') + "...", + noBackdrop: true, + duration: zm.httpTimeout }); login(u, zmu, zmp) .then(function (success) { $ionicLoading.hide(); ZMDataModel.zmLog("zmWizard: login succeeded"); - + // API Detection $ionicLoading.show({ - template: $translate.instant('kDiscoveringAPI')+"...", - noBackdrop: true, - duration: zm.httpTimeout - }); - detectapi() - .then (function (success) { - $ionicLoading.hide(); - ZMDataModel.zmLog ("zmWizard: API succeeded"); - - $ionicLoading.show({ - template: $translate.instant('kDiscoveringCGI')+"...", + template: $translate.instant('kDiscoveringAPI') + "...", noBackdrop: true, duration: zm.httpTimeout - }); - // CGI detection - detectcgi () - .then (function (success) { - $ionicLoading.hide(); - // return true here because we want to progress - return d.resolve(true); - }, - function (error) { - $ionicLoading.hide(); - // return true here because we want to progress - return d.resolve(true); - }); - }, - function (error) { - $ionicLoading.hide(); - ZMDataModel.zmLog("zmWizard: api failed"); - - // return true here because we want to progress - return d.resolve(true); }); - - + detectapi() + .then(function (success) { + $ionicLoading.hide(); + ZMDataModel.zmLog("zmWizard: API succeeded"); + + $ionicLoading.show({ + template: $translate.instant('kDiscoveringCGI') + "...", + noBackdrop: true, + duration: zm.httpTimeout + }); + // CGI detection + detectcgi() + .then(function (success) { + $ionicLoading.hide(); + // return true here because we want to progress + return d.resolve(true); + }, + function (error) { + $ionicLoading.hide(); + // return true here because we want to progress + return d.resolve(true); + }); + }, + function (error) { + $ionicLoading.hide(); + ZMDataModel.zmLog("zmWizard: api failed"); + + // return true here because we want to progress + return d.resolve(true); + }); + + }, - + // if login failed, don't progress in the wizard function (error) { $ionicLoading.hide(); @@ -609,9 +601,9 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ if (!$scope.wizard.portalurl) { $rootScope.zmPopup = SecuredPopups.show('show', { title: $translate.instant('kError'), - template: $translate.instant ('kPortalEmpty'), + template: $translate.instant('kPortalEmpty'), buttons: [{ - text: $translate.instant ('kButtonOk') + text: $translate.instant('kButtonOk') }] }); @@ -619,24 +611,31 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ } if (!checkscheme($scope.wizard.portalurl)) { - - $scope.portalproto = [ {text:"http",value:"http://"}, {text:"https",value:"https://"}]; - $scope.myproto = {proto:""}; - - - + + $scope.portalproto = [{ + text: "http", + value: "http://" + }, { + text: "https", + value: "https://" + }]; + $scope.myproto = { + proto: "" + }; + + + $rootScope.zmPopup = $ionicPopup.show({ title: $translate.instant('kPortalNoProto'), scope: $scope, - template: $translate.instant('kPortalPleaseSelect')+': <ion-radio-fix ng-repeat="item in portalproto" ng-value="item.value" ng-model="myproto.proto">{{item.text}}</ion-radio-fix>', + template: $translate.instant('kPortalPleaseSelect') + ': <ion-radio-fix ng-repeat="item in portalproto" ng-value="item.value" ng-model="myproto.proto">{{item.text}}</ion-radio-fix>', buttons: [{ - text: $translate.instant ('kButtonOk'), - onTap: function(e) - { - ZMDataModel.zmDebug ("Protocol selected:" + $scope.myproto.proto); - $scope.wizard.portalurl = $scope.myproto.proto+stripProto($scope.wizard.portalurl); + text: $translate.instant('kButtonOk'), + onTap: function (e) { + ZMDataModel.zmDebug("Protocol selected:" + $scope.myproto.proto); + $scope.wizard.portalurl = $scope.myproto.proto + stripProto($scope.wizard.portalurl); } - + }] }); @@ -654,7 +653,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ title: $translate.instant('kError'), template: $translate.instant('kPortalInvalidUrl'), buttons: [{ - text: $translate.instant ('kButtonOk') + text: $translate.instant('kButtonOk') }] }); @@ -683,7 +682,7 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ // part of auth wizard - toggles display of auth components //-------------------------------------------------------------------------- $scope.toggleAuth = function () { - + if (!$scope.wizard.useauth) { $scope.wizard.usebasicauth = false; $scope.wizard.usezmauth = false; @@ -702,13 +701,14 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ $scope.wizard.tiptext = $translate.instant('kShowTip'); }; - $scope.gotoLoginState = function() - { + $scope.gotoLoginState = function () { $rootScope.wizard = angular.copy($scope.wizard); $ionicHistory.nextViewOptions({ - disableBack: true - }); - $state.go("login", {"wizard":true}); + disableBack: true + }); + $state.go("login", { + "wizard": true + }); }; //-------------------------------------------------------------------------- @@ -747,4 +747,4 @@ angular.module('zmApp.controllers').controller('zmApp.WizardCtrl', ['$scope', '$ }); -}]);
\ No newline at end of file +}]); |