[commits] Horde branch develop updated. 5563a6e4b33635ae55d25d13770250bd6e718bc5

[Michael M Slusarz]

The branch "develop" has been updated.
The following is a summary of the commits.

from: 6f69ab0dd7e9008c5f7566f4347395a3cb848bdb

f501b12 Add script file object that will always trump base script object when it comes to priority
221bcdd Use correct cancel text
9a6386b Fix extending the default AJAX action options
80d2e1b Add HordeCore.submit
9b92026 Use HordeCore.submit on imp dynamic compose screen
608ae21 Fix uploading message with imp dynamic import dialog
5563a6e Fix js file output in smartmobile view

-----------------------------------------------------------------------

commit f501b1264f173370cc0135dfcd4243cf0059fe34
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jun 8 22:31:08 2012 -0600

    Add script file object that will always trump base script object when it comes to priority

 framework/Core/lib/Horde/PageOutput.php              |    9 +---
 framework/Core/lib/Horde/Script/File.php             |   38 ++++++++++++------
 framework/Core/lib/Horde/Script/File/External.php    |    2 +-
 framework/Core/lib/Horde/Script/File/JsFramework.php |   30 ++++++++++++++
 framework/Core/package.xml                           |    4 +-
 5 files changed, 63 insertions(+), 20 deletions(-)
 create mode 100644 framework/Core/lib/Horde/Script/File/JsFramework.php

http://git.horde.org/horde-git/-/commit/f501b1264f173370cc0135dfcd4243cf0059fe34

-----------------------------------------------------------------------

commit 221bcddef17a4c48c1c68848c492ef9ff622cb12
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jun 8 22:55:12 2012 -0600

    Use correct cancel text

 framework/Core/js/dialog.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/221bcddef17a4c48c1c68848c492ef9ff622cb12

-----------------------------------------------------------------------

commit 9a6386ba5ce2baed25ef5ffd1d6c2272a6acbb56
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jun 8 23:04:16 2012 -0600

    Fix extending the default AJAX action options

 framework/Core/js/hordecore.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/9a6386ba5ce2baed25ef5ffd1d6c2272a6acbb56

-----------------------------------------------------------------------

commit 80d2e1b6e7e95bc015388032796a2a4592c34530
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jun 8 23:24:33 2012 -0600

    Add HordeCore.submit
    
    Automatically add token information to a non-AJAX submit action (e.g.
    form POST with uploaded file data).

 framework/Core/js/hordecore.js |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/80d2e1b6e7e95bc015388032796a2a4592c34530

-----------------------------------------------------------------------

commit 9b92026a4c86689c9a023195fee8351814c50b74
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jun 8 23:26:17 2012 -0600

    Use HordeCore.submit on imp dynamic compose screen

 imp/js/compose-dimp.js             |    2 +-
 imp/lib/Dynamic/Compose/Common.php |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/9b92026a4c86689c9a023195fee8351814c50b74

-----------------------------------------------------------------------

commit 608ae21e5ed316b135637a322fcba37bef1acd7a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Jun 8 23:26:36 2012 -0600

    Fix uploading message with imp dynamic import dialog

 framework/Core/js/dialog.js           |    5 -----
 imp/js/dimpbase.js                    |   18 +++++++++---------
 imp/themes/default/dynamic/screen.css |    4 ++--
 3 files changed, 11 insertions(+), 16 deletions(-)

http://git.horde.org/horde-git/-/commit/608ae21e5ed316b135637a322fcba37bef1acd7a

-----------------------------------------------------------------------

commit 5563a6e4b33635ae55d25d13770250bd6e718bc5
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sun Jun 10 23:48:01 2012 -0600

    Fix js file output in smartmobile view

 framework/Core/lib/Horde/PageOutput.php |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/5563a6e4b33635ae55d25d13770250bd6e718bc5