merged conflicts

application-manager-new
Rasika Perera 9 years ago
commit 554d5a1acb

@ -11,8 +11,14 @@ File.prototype.getPath = function() {
var fuseState = {
zones: {},
appName: '',
<<<<<<< HEAD
zoneStack: [],
currentUnit: null
=======
currentZone: [], //TODO: rename to zone Stack
currentUnit: null,
viewModelCache:{}
>>>>>>> e27279a83b0f9a100b0a1df5ec6c63bf9b7dbf8e
};
var requestId = function makeId() {

@ -11,6 +11,9 @@ var getScope = function (unit,configs) {
var viewModel = {};
var cbResult;
if (jsFile.isExists()) {
if(fuseState.viewModelCache[jsFile.getPath()]){
cbResult = fuseState.viewModelCache[jsFile.getPath()];
}else{
script = require(jsFile.getPath());
//Eagerly make the viewModel the template configs
viewModel = templateConfigs;
@ -25,6 +28,10 @@ var getScope = function (unit,configs) {
onRequestCb = script.onRequest;
cbResult = onRequestCb(templateConfigs);
log.debug("passing configs to unit "+unit+" configs: "+stringify(templateConfigs));
fuseState.viewModelCache[jsFile.getPath()] = cbResult;
}
}
//If the execution does not yield an object we will print
//a warning as the unit author may have forgotten to return a data object
if(cbResult===undefined){
@ -34,7 +41,6 @@ var getScope = function (unit,configs) {
}
viewModel = cbResult;
}
}
else{
//If there is no script then the view should get the configurations
//passed in the unit call

@ -24,46 +24,7 @@ function formatDates(){
}
(function () {
var deviceId = $(".device-id");
var deviceIdentifier = deviceId.data("deviceid");
var deviceType = deviceId.data("type");
var payload = [deviceIdentifier];
if (deviceType == "ios") {
var serviceUrl = "/ios/operation/deviceinfo";
} else if (deviceType == "android") {
var serviceUrl = "/mdm-android-agent/operation/device-info";
}
invokerUtil.post(serviceUrl, payload,
function(message){
console.log(message);
}, function (message) {
console.log(message);
});
$(document).ready(function(){
loadOperationBar(deviceType);
loadMap();
formatDates();
});
function loadMap(){
var map;
function initialize() {
var mapOptions = {
zoom: 18
};
var lat = 6.9098591;
var long = 79.8523753;
map = new google.maps.Map(document.getElementById('device-location'),
mapOptions);
var pos = new google.maps.LatLng(lat,
long);
var marker = new google.maps.Marker({
position: pos,
map: map
});
map.setCenter(pos);
}
google.maps.event.addDomListener(window, 'load', initialize);
}
}());

@ -0,0 +1,30 @@
/*
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
* either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
function formatDates(){
$(".formatDate").each(function(){
var timeStamp = $(this).html();
$(this).html(new Date(parseInt(timeStamp)).toUTCString());
});
}
(function () {
$(document).ready(function(){
formatDates();
});
}());
Loading…
Cancel
Save