- Update Bluebird.

- Adding Control Panes.
This commit is contained in:
Gunther Brunner
2014-03-17 14:28:18 +09:00
parent 698bb4064a
commit 7a2cdaf071
4 changed files with 9 additions and 2 deletions

View File

@@ -9,6 +9,7 @@ angular.module('app', [
require('./layout').name,
require('./device-list').name,
require('./device-control').name,
require('./control-panes').name,
require('./settings').name,
require('./help').name
])

View File

@@ -1,5 +1,5 @@
div(pane, pane-anchor='west', pane-size='30% + 2px', pane-min='200px', pane-max='100% + 2px', pane-handle='4')
.stf-catch-all-keys(ng-controller='KeysCtrl')
//.stf-catch-all-keys(ng-controller='KeysCtrl')
catch-all-keys(keys-down='keysDown($event)', keys-up='keysUp($event)')
.remote-control
//include control-screen

View File

@@ -5,5 +5,11 @@ require('fa-borderlayout/build-0.3.1/stf-style.css')
module.exports = angular.module('control-panes', [
])
.config(['$routeProvider', function ($routeProvider) {
$routeProvider.when('/control-panes', {
template: require('./control-panes.jade'),
controller: 'ControlPanesCtrl'
})
}])
.factory('ControlPanesService', require('./control-panes-service'))
.controller('ControlPanesCtrl', require('./control-panes-controller'))

View File

@@ -3,7 +3,7 @@ require('./device-control.css')
module.exports = angular.module('device-control', [
require('stf/device').name,
require('stf/control').name,
require('stf/screen').name,
require('stf/screen').name
])
.config(['$routeProvider', function ($routeProvider) {
$routeProvider.when('/devices/:serial', {