Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Cesium
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
bpresles
Cesium
Commits
48ae2f43
Commit
48ae2f43
authored
5 years ago
by
Bertrand Presles
Browse files
Options
Downloads
Patches
Plain Diff
Disabled barcode for OSX
parent
d86b1bea
Branches
feature/macos-support
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#7156
skipped
Stage: alt_build
Changes
4
Pipelines
1
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
package.json
+1
-1
1 addition, 1 deletion
package.json
www/css/ionic.app.min.css
+1
-21
1 addition, 21 deletions
www/css/ionic.app.min.css
www/js/config.js
+2
-2
2 additions, 2 deletions
www/js/config.js
www/js/services/device-services.js
+5
-1
5 additions, 1 deletion
www/js/services/device-services.js
with
9 additions
and
25 deletions
package.json
+
1
−
1
View file @
48ae2f43
This diff is collapsed.
Click to expand it.
www/css/ionic.app.min.css
+
1
−
21
View file @
48ae2f43
This diff is collapsed.
Click to expand it.
www/js/config.js
+
2
−
2
View file @
48ae2f43
...
@@ -94,7 +94,7 @@ angular.module("cesium.config", [])
...
@@ -94,7 +94,7 @@ angular.module("cesium.config", [])
}
}
},
},
"
version
"
:
"
1.4.12
"
,
"
version
"
:
"
1.4.12
"
,
"
build
"
:
"
2019-11-0
5T15:23:40.710
Z
"
,
"
build
"
:
"
2019-11-0
8T20:56:38.011
Z
"
,
"
newIssueUrl
"
:
"
https://git.duniter.org/clients/cesium-grp/cesium/issues/new
"
"
newIssueUrl
"
:
"
https://git.duniter.org/clients/cesium-grp/cesium/issues/new
"
})
})
...
...
This diff is collapsed.
Click to expand it.
www/js/services/device-services.js
+
5
−
1
View file @
48ae2f43
...
@@ -206,6 +206,10 @@ angular.module('cesium.device.services', ['cesium.utils.services', 'cesium.setti
...
@@ -206,6 +206,10 @@ angular.module('cesium.device.services', ['cesium.utils.services', 'cesium.setti
return
!!
navigator
.
userAgent
.
match
(
/iPhone | iPad | iPod/i
)
||
ionic
.
Platform
.
isIOS
();
return
!!
navigator
.
userAgent
.
match
(
/iPhone | iPad | iPod/i
)
||
ionic
.
Platform
.
isIOS
();
};
};
exports
.
isOSX
=
function
()
{
return
!!
navigator
.
userAgent
.
match
(
/Macintosh/i
)
||
ionic
.
Platform
.
is
(
"
osx
"
);
};
exports
.
isDesktop
=
function
()
{
exports
.
isDesktop
=
function
()
{
if
(
!
angular
.
isDefined
(
cache
.
isDesktop
))
{
if
(
!
angular
.
isDefined
(
cache
.
isDesktop
))
{
try
{
try
{
...
@@ -237,7 +241,7 @@ angular.module('cesium.device.services', ['cesium.utils.services', 'cesium.setti
...
@@ -237,7 +241,7 @@ angular.module('cesium.device.services', ['cesium.utils.services', 'cesium.setti
if
(
exports
.
enable
){
if
(
exports
.
enable
){
exports
.
camera
.
enable
=
!!
navigator
.
camera
;
exports
.
camera
.
enable
=
!!
navigator
.
camera
;
exports
.
keyboard
.
enable
=
cordova
&&
cordova
.
plugins
&&
!!
cordova
.
plugins
.
Keyboard
;
exports
.
keyboard
.
enable
=
cordova
&&
cordova
.
plugins
&&
!!
cordova
.
plugins
.
Keyboard
;
exports
.
barcode
.
enable
=
cordova
&&
cordova
.
plugins
&&
!!
cordova
.
plugins
.
barcodeScanner
;
exports
.
barcode
.
enable
=
cordova
&&
cordova
.
plugins
&&
!!
cordova
.
plugins
.
barcodeScanner
&&
!
this
.
isOSX
()
;
exports
.
clipboard
.
enable
=
cordova
&&
cordova
.
plugins
&&
!!
cordova
.
plugins
.
clipboard
;
exports
.
clipboard
.
enable
=
cordova
&&
cordova
.
plugins
&&
!!
cordova
.
plugins
.
clipboard
;
if
(
exports
.
keyboard
.
enable
)
{
if
(
exports
.
keyboard
.
enable
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment