From aeae50077ba6f025327f93e2bfcc1341929948ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Mon, 9 Nov 2015 18:04:58 +0000 Subject: [PATCH] minor docu fixes --- ChangeLog | 6 ++++++ cordova/platforms/android/AndroidManifest.xml | 2 +- cordova/platforms/android/res/xml/config.xml | 2 +- doc/doxyfile.in | 7 +++---- html/safechat.js | 3 +-- makefile.am | 2 +- test/settings.wt | 1 + test/testcase.wt | 7 +++++++ 8 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 test/settings.wt create mode 100644 test/testcase.wt diff --git a/ChangeLog b/ChangeLog index 7974e1c..2b43421 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-11-09 15:12 marc + + * ChangeLog, bootstrap.sh, doc/doxyfile.in, html/makefile.am, + html/opendb.php, resolve-debbuilddeps.sh, sql-to-dot.sed: better + documentation + 2015-11-09 11:13 marc * ChangeLog, ax_init_standard_project.m4, bootstrap.sh, diff --git a/cordova/platforms/android/AndroidManifest.xml b/cordova/platforms/android/AndroidManifest.xml index 2757ae7..9b6d49b 100644 --- a/cordova/platforms/android/AndroidManifest.xml +++ b/cordova/platforms/android/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/cordova/platforms/android/res/xml/config.xml b/cordova/platforms/android/res/xml/config.xml index 4760080..4316490 100644 --- a/cordova/platforms/android/res/xml/config.xml +++ b/cordova/platforms/android/res/xml/config.xml @@ -1,5 +1,5 @@ - + diff --git a/doc/doxyfile.in b/doc/doxyfile.in index e1f3948..7424e78 100644 --- a/doc/doxyfile.in +++ b/doc/doxyfile.in @@ -748,8 +748,7 @@ WARN_LOGFILE = doxygen.errors # spaces. # Note: If this tag is empty the current directory is searched. -INPUT = @top_srcdir@/src -INPUT += @top_srcdir@/html +INPUT = @top_srcdir@/html INPUT += @top_srcdir@/scripts INPUT += @top_srcdir@/test @@ -771,7 +770,7 @@ INPUT_ENCODING = UTF-8 # *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, # *.qsf, *.as and *.js. -FILE_PATTERNS = *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.idl *.ddl *.odl *.h *.hh *.hxx *.hpp *.h++ *.cs *.d *.php *.php4 *.php5 *.phtml *.html *.inc *.m *.markdown *.md *.mm *.dox *.py *.f90 *.f *.for *.tcl *.vhd *.vhdl *.ucf *.qsf *.as *.js *.wt *.sql +FILE_PATTERNS = *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.idl *.ddl *.odl *.h *.hh *.hxx *.hpp *.h++ *.cs *.d *.php *.php4 *.php5 *.phtml *.inc *.m *.markdown *.md *.mm *.dox *.py *.f90 *.f *.for *.tcl *.vhd *.vhdl *.ucf *.qsf *.as *.js *.wt *.sql # The RECURSIVE tag can be used to specify whether or not subdirectories should # be searched for input files as well. @@ -786,7 +785,7 @@ RECURSIVE = YES # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = +EXCLUDE = @top_srcdir@/openpgp.js # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded diff --git a/html/safechat.js b/html/safechat.js index 2e50c1a..4b58748 100644 --- a/html/safechat.js +++ b/html/safechat.js @@ -135,8 +135,7 @@ function getLoopStop() { } /// Alert user -/** Alert user, e.g. that a new message has arrived. - @param */ +/** Alert user, e.g. that a new message has arrived. */ function alert() { navigator.vibrate = navigator.vibrate || navigator.webkitVibrate || navigator.mozVibrate || navigator.msVibrate; diff --git a/makefile.am b/makefile.am index 9de4295..d12b856 100644 --- a/makefile.am +++ b/makefile.am @@ -6,7 +6,7 @@ ## 1 2 3 4 5 6 7 8 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 -SUBDIRS = scripts doc html cordova +SUBDIRS = scripts doc html cordova test doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog diff --git a/test/settings.wt b/test/settings.wt new file mode 100644 index 0000000..989f455 --- /dev/null +++ b/test/settings.wt @@ -0,0 +1 @@ +set SAFECHAT-URL=http://localhost:8080 diff --git a/test/testcase.wt b/test/testcase.wt new file mode 100644 index 0000000..4c8aaa5 --- /dev/null +++ b/test/testcase.wt @@ -0,0 +1,7 @@ +load SAFECHAT-URL +expect load SAFECHAT-URL/ +setvalue #user -> 'test' +setvalue #pwd -> 'test' +setvalue #pwd2 -> 'test' +click #createuser +setvalue form#register[onsubmit="createkeypair(this.elements['user'].value, this.elements['pwd'].value)"]>input#createuser[type="submit"] -> '' \ No newline at end of file