mobile terminal features

ajenti · May 31, 2015 · 379d88f · 379d88f
1 parent bec69a6
commit 379d88f
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 11 deletions.
diff --git a/plugins/core/bower.json b/plugins/core/bower.json
@@ -20,7 +20,8 @@
     "fastclick": "~1.0.3",
     "angular-sortable-view": "0.0.13",
     "AngularJS-Toaster": "~0.4.9",
-    "angular-base64": "~2.0.4"
+    "angular-base64": "~2.0.4",
+    "mobile-detect": "*"
   },
   "resolutions": {
     "angular": "~1.4.0"

diff --git a/plugins/core/plugin.yml b/plugins/core/plugin.yml
@@ -2,7 +2,7 @@ name: core
 author: Ajenti project
 email: e@ajenti.org
 url: http://ajenti.org
-version: '0.36'
+version: '0.37'
 title: Core
 icon: link
 dependencies: []
@@ -25,6 +25,7 @@ resources:
     - 'resources/vendor/ngstorage/ngStorage.min.js'
     - 'resources/vendor/fastclick/lib/fastclick.js'
     - 'resources/vendor/angular-base64/angular-base64.js'
+    - 'resources/vendor/mobile-detect/mobile-detect.min.js'
     - 'resources/css/bootstrap/bootstrap.less'
     - 'resources/css/overrides.less'
     - 'resources/css/animations.less'

diff --git a/plugins/core/resources/images/icon.png b/plugins/core/resources/images/icon.png
diff --git a/plugins/core/resources/js/core/services/hotkeys.service.coffee b/plugins/core/resources/js/core/services/hotkeys.service.coffee
@@ -3,17 +3,20 @@ angular.module('core').service 'hotkeys', ($timeout, $window, $rootScope) ->
     @ENTER = 13
 
     handler = (e, mode) ->
+        isTextField = false
         if not e.metaKey and not e.ctrlKey
             if $('input:focus').length > 0 or $('textarea:focus').length > 0
-                return
+                isTextField = true
         if e.which < 32
             char = e.which
         else
             char = String.fromCharCode(e.which)
         #console.log(char, e)
-        $rootScope.$broadcast mode, char, e
+        if not isTextField
+            $rootScope.$broadcast mode, char, e
+        $rootScope.$broadcast "#{mode}:global", char, e
         $rootScope.$apply()
-        return
+        return 
 
     $timeout () ->
         $(document).keydown (e) -> handler(e, 'keydown')

diff --git a/plugins/filemanager/plugin.yml b/plugins/filemanager/plugin.yml
@@ -2,7 +2,7 @@ name: filemanager
 author: Ajenti project
 email: e@ajenti.org
 url: http://ajenti.org
-version: '0.13'
+version: '0.14'
 title: 'File Manager'
 icon: folder-o
 dependencies:

diff --git a/plugins/filemanager/resources/partial/properties.html b/plugins/filemanager/resources/partial/properties.html
@@ -127,7 +127,7 @@
     </div>
 </div>
 
-<dialog ng:show="permissionsDialogVisible">
+<dialog ng:show="permissionsDialogVisible" ng:cloak>
     <div class="modal-header">
         <h4>Permission bits</h4>
     </div>

diff --git a/plugins/terminal/plugin.yml b/plugins/terminal/plugin.yml
@@ -2,7 +2,7 @@ name: terminal
 author: Ajenti project
 email: e@ajenti.org
 url: http://ajenti.org
-version: '0.17'
+version: '0.18'
 title: 'Terminal'
 icon: terminal
 dependencies:

diff --git a/plugins/terminal/resources/css/terminal.less b/plugins/terminal/resources/css/terminal.less
@@ -61,5 +61,36 @@ terminal {
             cursor: text;
         }
     }
+
+    .mobile-input-area {
+        position: absolute;
+        left: 0;
+        top: 0;
+        bottom: 0;
+        width: 100%;
+        display: block;
+        opacity: 0;
+        z-index: 5;
+        -webkit-user-modify: read-write-plaintext-only;
+    }
+
+    .extra-keyboard-toggle {
+        position: absolute;
+        bottom: 15px;
+        right: 15px;
+        z-index: 15;
+    }
+
+    .extra-keyboard {
+        position: absolute;
+        bottom: 15px;
+        left: 15px;
+        width: 100%;
+        z-index: 10;
+
+        .btn.active {
+            color: blue;
+        }
+    }
 }
 
diff --git a/plugins/terminal/resources/js/directives/terminal.coffee b/plugins/terminal/resources/js/directives/terminal.coffee
@@ -43,11 +43,45 @@ angular.module('ajenti.terminal').directive 'terminal', ($timeout, $log, $q, soc
                         ng:blur="pasteAreaFocused = false"
                     ></textarea>
                 </div>
+
+                <textarea
+                    class="mobile-input-area"
+                    ng:if="isMobile"
+                    autocomplete="off" 
+                    autocorrect="off" 
+                    autocapitalize="off" 
+                    spellcheck="false"
+                ></textarea>
+
+                <a class="extra-keyboard-toggle btn btn-default" ng:click="extraKeyboardVisible=!extraKeyboardVisible" ng:show="isMobile">
+                    <i class="fa fa-keyboard-o"></i>
+                </a>
+
+                <div class="extra-keyboard" ng:show="extraKeyboardVisible">
+                    <a class="btn btn-default" ng:click="extraKeyboardCtrl = true" ng:class="{active: extraKeyboardCtrl}">
+                        Ctrl
+                    </a>
+                    <a class="btn btn-default" ng:click="fakeKeyEvent(38)">
+                        <i class="fa fa-arrow-up"></i>
+                    </a>
+                    <a class="btn btn-default" ng:click="fakeKeyEvent(40)">
+                        <i class="fa fa-arrow-down"></i>
+                    </a>
+                    <a class="btn btn-default" ng:click="fakeKeyEvent(37)">
+                        <i class="fa fa-arrow-left"></i>
+                    </a>
+                    <a class="btn btn-default" ng:click="fakeKeyEvent(39)">
+                        <i class="fa fa-arrow-right"></i>
+                    </a>
+                </div>
             </div>
         '''
         link: ($scope, element, attrs) ->
             element.addClass('block-element')
 
+            $scope.isMobile = new MobileDetect(window.navigator.userAgent).mobile()
+            $scope.extraKeyboardVisible = false
+
             $scope.charWidth = 7
             $scope.charHeight = 14
             $scope.canvas = element.find('canvas')[0]
@@ -233,7 +267,7 @@ angular.module('ajenti.terminal').directive 'terminal', ($timeout, $log, $q, soc
 
                 #$log.log event
 
-                if event_name == 'keypress' and event.charCode
+                if event_name == 'keypress' and (event.charCode or event.which)
                     ch = String.fromCharCode(event.which)
                     if ch == '\r'
                         ch = '\n'
@@ -300,6 +334,9 @@ angular.module('ajenti.terminal').directive 'terminal', ($timeout, $log, $q, soc
             handler = (key, event, mode) ->
                 if $scope.pasteAreaFocused or $scope.disabled
                     return
+                if $scope.extraKeyboardCtrl
+                    event.ctrlKey = true
+                    $scope.extraKeyboardCtrl = false
                 ch = $scope.parseKey(event, mode)
                 if not ch
                     return false
@@ -308,11 +345,14 @@ angular.module('ajenti.terminal').directive 'terminal', ($timeout, $log, $q, soc
 
             hotkeys.on $scope, (k, e) ->
                 return handler(k, e, 'keypress')
-            , 'keypress'
+            , 'keypress:global'
 
             hotkeys.on $scope, (k, e) ->
                 return handler(k, e, 'keydown')
-            , 'keydown'
+            , 'keydown:global'
+
+            $scope.fakeKeyEvent = (code) ->
+                handler(null, {keyCode: code}, 'keydown')
 
             $scope.$watch 'pasteData', () ->
                 if $scope.pasteData