diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-06-01 11:29:50 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-06-01 11:29:50 -0400 |
| commit | 8f5eba7828d1edf76a277c71b34da237e8c8441f (patch) | |
| tree | 395a3563eee2893a9ec9ef2309839ffddeab7111 /www/js/MontageCtrl.js | |
| parent | 3e70efa61d1567735b16183c01eaad4aa75fe9b5 (diff) | |
switched plugins to reduce android permissions, added cast support - but it breaks in android, will likely disable
Former-commit-id: 15807900f05d387579ade0f02081ac993f064757
Diffstat (limited to 'www/js/MontageCtrl.js')
| -rw-r--r-- | www/js/MontageCtrl.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index e58af3c5..54ab982c 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -1,7 +1,7 @@ // Controller for the montage view /* jshint -W041 */ /* jslint browser: true*/ -/* global cordova,StatusBar,angular,console,ionic,Packery, Draggabilly, imagesLoaded */ +/* global cordova,StatusBar,angular,console,ionic,Packery, Draggabilly, imagesLoaded, ConnectSDK */ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '$rootScope', 'ZMDataModel', 'message', '$ionicSideMenuDelegate', '$timeout', '$interval', '$ionicModal', '$ionicLoading', '$http', '$state', '$ionicPopup', '$stateParams', '$ionicHistory', '$ionicScrollDelegate', '$ionicPlatform', 'zm', '$ionicPopover', '$controller', 'imageLoadingDataShare', '$window', '$localstorage', '$translate', function ($scope, $rootScope, ZMDataModel, message, $ionicSideMenuDelegate, $timeout, $interval, $ionicModal, $ionicLoading, $http, $state, $ionicPopup, $stateParams, $ionicHistory, $ionicScrollDelegate, $ionicPlatform, zm, $ionicPopover, $controller, imageLoadingDataShare, $window, $localstorage, $translate) { @@ -28,6 +28,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', ' // Handling of back button in case modal is open should // close the modal // -------------------------------------------------------- + $ionicPlatform.registerBackButtonAction(function (e) { e.preventDefault(); |