Index: openacs-4/packages/acs-tcl/acs-tcl.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/acs-tcl.info,v
diff -u -r1.70.2.9 -r1.70.2.10
--- openacs-4/packages/acs-tcl/acs-tcl.info 5 Jan 2016 14:55:50 -0000 1.70.2.9
+++ openacs-4/packages/acs-tcl/acs-tcl.info 5 Jan 2016 18:03:48 -0000 1.70.2.10
@@ -9,7 +9,7 @@
f
t
-
+
OpenACS
The Kernel Tcl API library.
2015-10-04
@@ -18,7 +18,7 @@
GPL version 2
3
-
+
Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v
diff -u -r1.118.2.8 -r1.118.2.9
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 2 Jan 2016 00:46:28 -0000 1.118.2.8
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 5 Jan 2016 18:03:48 -0000 1.118.2.9
@@ -1444,6 +1444,20 @@
# return the physical peer address
return [ns_conn $var]
}
+
+ mobile_p {
+ #
+ # Check, if we are used from a mobile device (based on user_agent).
+ #
+ if {[ns_conn isconnected]} {
+ set user_agent [string tolower [ns_set get [ns_conn headers] User-Agent]]
+ set ad_conn(mobile_p) [regexp (android|webos|iphone|ipad) $user_agent]
+ } else {
+ set ad_conn(mobile_p) 0
+ }
+ return $ad_conn(mobile_p)
+ }
+
default {
return [ns_conn $var]
}
Index: openacs-4/packages/richtext-tinymce/richtext-tinymce.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-tinymce/richtext-tinymce.info,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/richtext-tinymce/richtext-tinymce.info 3 Jan 2016 20:38:56 -0000 1.1.2.1
+++ openacs-4/packages/richtext-tinymce/richtext-tinymce.info 5 Jan 2016 18:03:48 -0000 1.1.2.2
@@ -9,13 +9,14 @@
f
f
-
+
Gustaf Neumann
Richtext editor plugin for integrating TinyMCE with acs-templating
0
-
+
+
Index: openacs-4/packages/richtext-tinymce/tcl/richtext-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-tinymce/tcl/richtext-procs.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/richtext-tinymce/tcl/richtext-procs.tcl 3 Jan 2016 20:38:57 -0000 1.1.2.1
+++ openacs-4/packages/richtext-tinymce/tcl/richtext-procs.tcl 5 Jan 2016 18:03:48 -0000 1.1.2.2
@@ -145,10 +145,13 @@
} {
#
- # In case no editor instances are created, nothing has to be
- # done.
+ # In case no editor instances are created, or we are on a
+ # mobile browser, which is not supported be the current
+ # version of tinymce, nothing has to be done (i.e. the plain
+ # text area will be shown). Probably, newer versions of
+ # tinymce provide some mobile support.
#
- if {![info exists ::acs_blank_master(tinymce)]} {
+ if {![info exists ::acs_blank_master(tinymce)] || [ad_conn mobile_p]} {
return
}
Index: openacs-4/packages/richtext-xinha/richtext-xinha.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-xinha/richtext-xinha.info,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/richtext-xinha/richtext-xinha.info 3 Jan 2016 20:46:21 -0000 1.1.2.1
+++ openacs-4/packages/richtext-xinha/richtext-xinha.info 5 Jan 2016 18:03:48 -0000 1.1.2.2
@@ -9,13 +9,14 @@
f
f
-
+
Gustaf Neumann
Richtext editor plugin for integrating Xinha with acs-templating
0
-
+
+
Index: openacs-4/packages/richtext-xinha/tcl/richtext-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/richtext-xinha/tcl/richtext-procs.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/richtext-xinha/tcl/richtext-procs.tcl 3 Jan 2016 20:46:21 -0000 1.1.2.1
+++ openacs-4/packages/richtext-xinha/tcl/richtext-procs.tcl 5 Jan 2016 18:03:48 -0000 1.1.2.2
@@ -115,10 +115,11 @@
} {
#
- # In case no xinha instances are created, nothing has to be
- # done.
+ # In case no xinha instances are created, or we are on a
+ # mobile browser, which is not supported via xinha, nothing
+ # has to be done (i.e. the plain text area will be shown)
#
- if {![info exists ::acs_blank_master(xinha)]} {
+ if {![info exists ::acs_blank_master(xinha)] || [ad_conn mobile_p]} {
return
}
set ::xinha_dir /resources/richtext-xinha/xinha-nightly/