build v3.2.0 for nc 12

nextcloud · May 17, 2017 · 554ca9c · 554ca9c
1 parent e3e1d60
commit 554ca9c
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 35 deletions.
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -5,7 +5,7 @@
    <name>JavaScript XMPP Chat</name>
    <summary>Facebook-like chat</summary>
    <description>Facebook-like chat with end-to-end encrypted conversation, video calls, multi-user rooms, XMPP and internal server backend.</description>
-   <version>3.2.0-beta.3</version>
+   <version>3.2.0</version>
    <licence>agpl</licence>
    <author mail="[email protected]">Klaus Herberth</author>
    <author>Tobia De Koninck</author>

diff --git a/build/appinfo/info.xml b/build/appinfo/info.xml
@@ -5,7 +5,7 @@
    <name>JavaScript XMPP Chat</name>
    <summary>Facebook-like chat</summary>
    <description>Facebook-like chat with end-to-end encrypted conversation, video calls, multi-user rooms, XMPP and internal server backend.</description>
-   <version>3.2.0-beta.3</version>
+   <version>3.2.0</version>
    <licence>agpl</licence>
    <author mail="[email protected]">Klaus Herberth</author>
    <author>Tobia De Koninck</author>

diff --git a/build/css/jsxc.oc.css b/build/css/jsxc.oc.css
@@ -1,13 +1,13 @@
 /*!
- * ojsxc v3.2.0-beta.3 - 2017-05-02
+ * ojsxc v3.2.0 - 2017-05-17
  * 
  * Copyright (c) 2017 Klaus Herberth <[email protected]> <br>
  * Released under the MIT license
  * 
  * Please see http://www.jsxc.org/
  * 
  * @author Klaus Herberth <[email protected]>
- * @version 3.2.0-beta.3
+ * @version 3.2.0
  * @license MIT
  */
 
@@ -2799,7 +2799,7 @@ fieldset[disabled] #jsxc_webrtc .checkbox label {
   width: 14px;
   height: 100%;
   position: absolute;
-  left: -14px !important;
+  right: 100%;
   top: 0;
   z-index: 110;
   background-color: transparent;
@@ -4443,6 +4443,9 @@ div.jsxc_video {
   top: 45px;
   z-index: 1500; }
 
+#jsxc_toggleRoster {
+  width: 8px; }
+
 #jsxc_windowList, #jsxc_windowListSB {
   z-index: 1500; }
 

diff --git a/build/js/eof.js b/build/js/eof.js
@@ -1,13 +1,13 @@
 /*!
- * ojsxc v3.2.0-beta.3 - 2017-05-02
+ * ojsxc v3.2.0 - 2017-05-17
  * 
  * Copyright (c) 2017 Klaus Herberth <[email protected]> <br>
  * Released under the MIT license
  * 
  * Please see http://www.jsxc.org/
  * 
  * @author Klaus Herberth <[email protected]>
- * @version 3.2.0-beta.3
+ * @version 3.2.0
  * @license MIT
  */
 

diff --git a/build/js/jsxc/css/jsxc.css b/build/js/jsxc/css/jsxc.css
@@ -2552,7 +2552,7 @@ fieldset[disabled]
   width: 14px;
   height: 100%;
   position: absolute;
-  left: -14px !important;
+  right: 100%;
   top: 0;
   z-index: 110;
   background-color: transparent;

diff --git a/build/js/jsxc/jsxc.js b/build/js/jsxc/jsxc.js
@@ -1,13 +1,13 @@
 /*!
- * jsxc v3.2.0-beta.2 - 2017-04-28
+ * jsxc v3.2.0 - 2017-05-17
  * 
  * Copyright (c) 2017 Klaus Herberth <[email protected]> <br>
  * Released under the MIT license
  * 
  * Please see http://www.jsxc.org/
  * 
  * @author Klaus Herberth <[email protected]>
- * @version 3.2.0-beta.2
+ * @version 3.2.0
  * @license MIT
  */
 
@@ -25,7 +25,7 @@ var jsxc = null, RTC = null, RTCPeerconnection = null;
  */
 jsxc = {
    /** Version of jsxc */
-   version: '3.2.0-beta.2',
+   version: '3.2.0',
 
    /** True if i'm the master */
    master: false,
@@ -3670,6 +3670,8 @@ jsxc.gui = {
       $('[data-bid="' + bid + '"]').each(function() {
          var el = $(this);
 
+         el.attr('data-status', pres);
+
          if (!el.hasClass('jsxc_statusIndicator')) {
             el = el.find('.jsxc_statusIndicator');
          }
@@ -3801,7 +3803,11 @@ jsxc.gui = {
             element.off('click').click(function(ev) {
                ev.stopPropagation();
 
-               jsxc.gui.queryActions[action].call(jsxc, jid, params);
+               if (jsxc.xmpp.conn && jsxc.xmpp.conn.connected) {
+                  jsxc.gui.queryActions[action].call(jsxc, jid, params);
+               } else {
+                  jsxc.gui.showNotification($.t('no_connection'), $.t('You_have_to_go_online_'));
+               }
 
                return false;
             });

diff --git a/build/js/jsxc/jsxc.min.js b/build/js/jsxc/jsxc.min.js
diff --git a/build/js/jsxc/jsxc.min.js.map b/build/js/jsxc/jsxc.min.js.map
diff --git a/build/js/jsxc/lib/jsxc.dep.js b/build/js/jsxc/lib/jsxc.dep.js
diff --git a/build/js/jsxc/lib/jsxc.dep.min.js b/build/js/jsxc/lib/jsxc.dep.min.js
diff --git a/build/js/jsxc/lib/jsxc.dep.min.js.map b/build/js/jsxc/lib/jsxc.dep.min.js.map
diff --git a/build/js/jsxc/lib/translation.js b/build/js/jsxc/lib/translation.js
diff --git a/build/js/ojsxc.js b/build/js/ojsxc.js
@@ -1,13 +1,13 @@
 /*!
- * ojsxc v3.2.0-beta.3 - 2017-05-02
+ * ojsxc v3.2.0 - 2017-05-17
  * 
  * Copyright (c) 2017 Klaus Herberth <[email protected]> <br>
  * Released under the MIT license
  * 
  * Please see http://www.jsxc.org/
  * 
  * @author Klaus Herberth <[email protected]>
- * @version 3.2.0-beta.3
+ * @version 3.2.0
  * @license MIT
  */
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ojsxc",
-  "version": "3.2.0-beta.3",
+  "version": "3.2.0",
   "description": "Real-time chat app for Nextcloud",
   "homepage": "http://www.jsxc.org/",
   "bugs": "https://github.com/jsxc/jsxc/issues",