Skip to content

Commit

Permalink
Added a cache=false for all state routes - it was caching data only f…
Browse files Browse the repository at this point in the history
…or TimeLine View - no idea why. This was causing the monitor array to retain old values even after you did a server switch. Curiously it worked well in all others. Hopefully this puts it to rest.
  • Loading branch information
pliablepixels committed Nov 7, 2016
1 parent cf71e2d commit cd1a23b
Showing 1 changed file with 19 additions and 0 deletions.
19 changes: 19 additions & 0 deletions www/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1725,6 +1725,7 @@ angular.module('zmApp', [
requireLogin: false
},
url: "/login/:wizard",
cache: false,
templateUrl: "templates/login.html",
controller: 'zmApp.LoginCtrl',

Expand All @@ -1736,6 +1737,7 @@ angular.module('zmApp', [
requireLogin: false
},
url: "/help",
cache: false,
templateUrl: "templates/help.html",
controller: 'zmApp.HelpCtrl',

Expand All @@ -1746,6 +1748,7 @@ angular.module('zmApp', [
requireLogin: false
},
url: "/news",
cache: false,
templateUrl: "templates/news.html",
controller: 'zmApp.NewsCtrl',

Expand All @@ -1764,6 +1767,7 @@ angular.module('zmApp', [
}
},
url: "/monitors",
cache: false,
templateUrl: "templates/monitors.html",
controller: 'zmApp.MonitorCtrl',

Expand All @@ -1780,6 +1784,7 @@ angular.module('zmApp', [
return NVRDataModel.getMonitors(0);
}
},
cache: false,
url: "/events/:id/:playEvent",
templateUrl: "templates/events.html",
controller: 'zmApp.EventCtrl',
Expand All @@ -1793,6 +1798,7 @@ angular.module('zmApp', [
},

url: "/lowversion/:ver",
cache: false,
templateUrl: "templates/lowversion.html",
controller: 'zmApp.LowVersionCtrl',

Expand All @@ -1804,6 +1810,7 @@ angular.module('zmApp', [
requireLogin: false
},

cache: false,
url: "/importantmessage/:ver",
templateUrl: "templates/important_message.html",
controller: 'zmApp.ImportantMessageCtrl',
Expand All @@ -1817,6 +1824,7 @@ angular.module('zmApp', [
data: {
requireLogin: true
},
cache: false,
url: "/events-graphs",
templateUrl: "templates/events-graphs.html",
controller: 'zmApp.EventsGraphsCtrl',
Expand All @@ -1828,6 +1836,7 @@ angular.module('zmApp', [
data: {
requireLogin: true
},
cache: false,
url: "/events-date-time-filter",
templateUrl: "templates/events-date-time-filter.html",
controller: 'zmApp.EventDateTimeFilterCtrl',
Expand All @@ -1838,6 +1847,7 @@ angular.module('zmApp', [
data: {
requireLogin: true
},
cache: false,
url: "/state",
templateUrl: "templates/state.html",
controller: 'zmApp.StateCtrl',
Expand All @@ -1849,6 +1859,7 @@ angular.module('zmApp', [
requireLogin: true
},
url: "/devoptions",
cache: false,
templateUrl: "templates/devoptions.html",
controller: 'zmApp.DevOptionsCtrl',
})
Expand All @@ -1864,6 +1875,7 @@ angular.module('zmApp', [
}
},
url: "/timeline",
cache:false,
templateUrl: "templates/timeline.html",
controller: 'zmApp.TimelineCtrl',

Expand All @@ -1879,6 +1891,7 @@ angular.module('zmApp', [
}
},
url: "/eventserversettings",
cache: false,
templateUrl: "templates/eventserversettings.html",
controller: 'zmApp.EventServerSettingsCtrl',

Expand All @@ -1889,6 +1902,7 @@ angular.module('zmApp', [
requireLogin: false
},
url: "/log",
cache: false,
templateUrl: "templates/log.html",
controller: 'zmApp.LogCtrl',

Expand All @@ -1899,6 +1913,7 @@ angular.module('zmApp', [
requireLogin: false
},
url: "/wizard",
cache: false,
templateUrl: "templates/wizard.html",
controller: 'zmApp.WizardCtrl',

Expand All @@ -1909,6 +1924,7 @@ angular.module('zmApp', [
requireLogin: false
},
url: "/zm-portal-login",
cache: false,
templateUrl: "templates/zm-portal-login.html",
controller: 'zmApp.PortalLoginCtrl',
nativeTransitions: null // disable for speed
Expand All @@ -1920,6 +1936,7 @@ angular.module('zmApp', [
requireLogin: false
},
url: "/first-use",
cache: false,
templateUrl: "templates/first-use.html",
controller: 'zmApp.FirstUseCtrl',

Expand All @@ -1936,6 +1953,7 @@ angular.module('zmApp', [
}

},
cache: false,
url: "/montage-history",
templateUrl: "templates/montage-history.html",
controller: 'zmApp.MontageHistoryCtrl',
Expand All @@ -1959,6 +1977,7 @@ angular.module('zmApp', [

},
url: "/montage",
cache: false,
templateUrl: "templates/montage.html",
controller: 'zmApp.MontageCtrl',
params: {
Expand Down

0 comments on commit cd1a23b

Please sign in to comment.