build v1.0.0

fix duplicates on roster change
stop propagation
2014-11-06 14:16:16 +01:00 · 2014-11-05 23:16:17 +01:00 · 2014-11-05 23:11:22 +01:00 · 2014-11-04 15:44:49 +01:00 · 2014-11-04 15:41:36 +01:00 · 2014-11-04 15:35:36 +01:00
@@ -1 +1,3 @@
 node_modules
+*.zip
+*.zip.sig
@@ -1,3 +1,75 @@
+v1.0.0 / 2014-11-06
+===
+- add unread flag to roster and scroll to target window
+- add XEP-0147 URI Scheme Query support
+- add has-come-online notification
+- add silent notification request
+- add more information in vCard view
+- add resizable function to chat window
+- add vertical scrollbar to window list
+- add call information to chat window
+- add concatinated and uglified files
+- add translations
+- minor video call improvements
+- minor style improvements
+- generate dsa key complete in background
+- update caps node property to jsxc.org
+- update strophe.jingle
+- update otr
+- fix wrong avatars
+- fix minor message delivery errors 
+- fix ff snapshot security error
+- fix case sensitive resource handling
+- fix non-square avatars
+- fix several video issues
+- fix messages from unknown (not in roster) jid
+- fix vcard retrieval from unknown (not in roster) jid
+- fix vcard in second tab
+- fix jids with non-word characters (replace user identifier)
+- improve video window design
+- improve user info
+- improve login box
+- improve smp user interaction
+- improve notifications (sync sound/message, icon)
+- minor chat window improvements
+- detect email in message
+- detect uri scheme in message
+- end all private conversations on logout
+- remove email pattern from contact dialog
+- disable video on second tab
+- add/require disco dtls feature for webrtc
+- move emoticons to css
+- handle loadSettings failure
+- change cursor for some elements
+- prevent event bubbling for dialog
+
+v0.8.2 / 2014-08-20
+===
+- fix use of custom username
+- write to console only if debug flag is set
+- allow string|boolean as config param
+- add translations
+
+v0.8.1 / 2014-08-12
+===
+- add user-defined xmpp options
+- fix login form without id submit
+
+v0.8.0 / 2014-07-02
+===
+- add spanish translation
+- add vCard view
+- add more emoticons
+- add grayscale to buddies without subscription
+- add settings for priorities
+- add hint if roster is empty
+- add sound files
+- new chat window design
+- enhanced roster design
+- fix emoticon replacement (XEP-0038)
+- fix some ui issues (explanations,...)
+- fix issue with password only field
+
 v0.7.2 / 2014-05-28
 ===
 - fix login issue
@@ -69,4 +141,4 @@ v0.5.1 / 2014-01-27
 - handle already attached submit events on login form
 - style changes
 - fix webrtc startup
- don't block application on dsa key generation
+- don't block application on dsa key generation
@@ -1,6 +1,11 @@
 /* global module:false */
 module.exports = function(grunt) {
-
+   
+   var dep = grunt.file.readJSON('dep.json');
+   var dep_files = dep.map(function(el) {
+      return el.file;
+   });
+   
   // Project configuration.
   grunt.initConfig({
      app: grunt.file.readJSON('package.json'),
@@ -20,7 +25,7 @@ module.exports = function(grunt) {
         main: {
            files: [ {
               expand: true,
-               src: [ 'lib/strophe.jingle/*.js', 'lib/otr/build/**', 'lib/otr/lib/dsa-webworker.js', 'lib/otr/lib/sm-webworker.js', 'lib/otr/lib/const.js', 'lib/otr/lib/helpers.js', 'lib/otr/lib/dsa.js', 'lib/otr/vendor/*.js', 'lib/*.js', 'jsxc.lib.js', 'jsxc.lib.webrtc.js', '*.css', 'LICENSE', 'img/**' ],
+               src: [ 'lib/strophe.jingle/*.js', 'lib/otr/build/**', 'lib/otr/lib/dsa-webworker.js', 'lib/otr/lib/sm-webworker.js', 'lib/otr/lib/const.js', 'lib/otr/lib/helpers.js', 'lib/otr/lib/dsa.js', 'lib/otr/vendor/*.js', 'lib/*.js', 'jsxc.lib.js', 'jsxc.lib.webrtc.js', '*.css', 'LICENSE', 'img/**', 'sound/**' ],
               dest: 'build/'
            } ]
         }
@@ -46,6 +51,94 @@ module.exports = function(grunt) {
               to: "<%= app.version %>"
            } ]
         }
+      },
+      concat: {
+         dep: {
+            options: {
+               banner: '/*!\n' +
+                  ' * <%= app.name %> v<%= app.version %> - <%= grunt.template.today("yyyy-mm-dd") %>\n' +
+                  ' * \n' +
+                  ' * This file concatenates all dependencies of <%= app.name %>.\n' +
+                  ' * \n' +
+                  ' */\n\n',
+               process: function(src, filepath) {
+                  if (filepath === 'build/lib/otr/build/dep/crypto.js') { 
+                     src += ';';
+                  }
+                  
+                  var data = dep[dep_files.indexOf(filepath)];
+                  
+                  return '/*!\n * Source: ' + filepath + ', license: ' + data.license + ', url: ' + data.url + ' */\n' + src;
+               }
+            },
+            src: dep_files,
+            dest: 'build/lib/jsxc.dep.js'
+         },
+         jsxc: {
+            options: {
+               banner: '/*! This file is concatenated for the browser. */\n\n'
+            },
+            src: ['build/jsxc.lib.js', 'build/jsxc.lib.webrtc.js'],
+            dest: 'build/jsxc.js'
+         }
+      },
+      uglify: {
+         jsxc: {
+            options: {
+               mangle: false,
+               sourceMap: true,
+               preserveComments: 'some'
+            },
+            files: {
+               'build/lib/jsxc.dep.min.js': ['build/lib/jsxc.dep.js'],
+               'build/jsxc.min.js': ['build/jsxc.js']
+            }
+         }
+      },
+      search: {
+         console: {
+            files: {
+               src: [ '*.js' ]
+            },
+            options: {
+               searchString: /console\.log\((?!'[<>]|msg)/g,
+               logFormat: 'console',
+               failOnMatch: true
+            }
+         },
+         changelog: {
+            files: {
+               src: [ 'CHANGELOG.md' ]
+            },
+            options: {
+               searchString: "<%= app.version %>",
+               logFormat: 'console',
+               onComplete: function(m) {
+                  if (m.numMatches === 0) {
+                     grunt.fail.fatal("No entry in README.md for current version found.");
+                  }
+               }
+            }
+         }
+      },
+      compress: {
+         main: {
+            options: {
+               archive: "jsxc-<%= app.version %>.zip"
+            },
+            files: [ {
+               src: [ '**' ],
+               expand: true,
+               dest: 'jsxc/',
+               cwd: 'build/'
+            } ]
+         }
+      },
+      jsdoc: {
+          dist: {
+              src: ['jsxc.lib.js', 'jsxc.lib.webrtc.js'],
+              dest: 'doc'
+          }
      }
   });

@@ -53,10 +146,20 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-clean');
+   grunt.loadNpmTasks('grunt-contrib-concat');
+   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-banner');
   grunt.loadNpmTasks('grunt-text-replace');
+   grunt.loadNpmTasks('grunt-search');
+   grunt.loadNpmTasks('grunt-contrib-compress');
+   grunt.loadNpmTasks('grunt-jsdoc');

   // Default task.
-   grunt.registerTask('default', [ 'jshint', 'clean', 'copy', 'usebanner', 'replace' ]);
+   grunt.registerTask('default', [ 'jshint', 'search', 'jsdoc', 'clean', 'copy', 'usebanner', 'replace', 'concat', 'uglify', 'compress' ]);

+   // Create alpha/beta build
+   grunt.registerTask('pre', [ 'jshint', 'search:console', 'clean', 'copy', 'usebanner', 'replace', 'concat', 'uglify', 'compress' ]);
+
+   // before commit
+   grunt.registerTask('commit', [ 'jshint', 'search:console' ]);
 };
@@ -1,44 +1,8 @@
 # JavaScript XMPP Client

-__Beware! This is beta software.__
-
 Real-time chat app. This app requires an external XMPP server (openfire, ejabberd etc.).

-### Features
- integration into existing UI
- one-to-one conversation (XMPP)
- encrypted one-to-one conversation (OTR)
-  - use of whitespace tags to start a OTR session
- user verification (SMP)
- encrypted one-to-one video call (WebRTC)
-  - [TURN REST API](http://tools.ietf.org/html/draft-uberti-behave-turn-rest-00)
-  - fullscreen mode
-  - snapshots
- automatic link-detection
- emotions
- roster management 
- multi-language support (de, en)
- multi-tab support
-
-### Supported protocols
- XMPP Core (RFC6120)
- XMPP IM (RFC6121)
- Bidirectional-streams Over Synchronous HTTP (XEP-0124)
- XMPP Over BOSH (XEP-0206)
- Service Discovery (XEP-0030)
- CAP (XEP-0127)
- Jingle (XEP-0166)
- Jingle RTP Sessions (XEP-0167)
-
-### Supported browsers
- Full support for __Chrome__ and __Firefox__.
- __IE__ doesn't support multiple tabs, WebRTC, and Notifications.
- __Safari__ doesn't support WebRTC and (before Safari 7) Notifications.
-
-### Planned features
- multi user chat
- video conference
- encrypted file transfer 
+You find a list of features, supported protocols and browsers at the homepage of __[Javascript XMPP Client](http://www.jsxc.org)__.

 ## Developer notes

@@ -1,4 +1,4 @@
-/**
+/*!
 * <%= app.name %> v<%= app.version %> - <%= grunt.template.today("yyyy-mm-dd") %>
 * 
 * Copyright (c) <%= grunt.template.today("yyyy") %> <%= app.author %> <br>
@@ -8,4 +8,5 @@
 * 
 * @author <%= app.author %>
 * @version <%= app.version %>
+ * @license MIT
 */
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Layer_1"
+   xml:space="preserve"
+   height="147.22015"
+   viewBox="0 0 192.89149 147.21771"
+   width="192.89587"
+   version="1.1"
+   y="0px"
+   x="0px"
+   enable-background="new 0 0 176.486 181.437"
+   inkscape:version="0.91pre2 r"
+   sodipodi:docname="XMPP_logo.svg"><metadata
+     id="metadata41"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs39" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview37"
+     showgrid="false"
+     fit-margin-top="10"
+     fit-margin-left="10"
+     fit-margin-right="10"
+     fit-margin-bottom="10"
+     inkscape:zoom="1.3007054"
+     inkscape:cx="71.332001"
+     inkscape:cy="72.501142"
+     inkscape:window-x="75"
+     inkscape:window-y="34"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><linearGradient
+     id="SVGID_1_"
+     y2="0.00048828"
+     gradientUnits="userSpaceOnUse"
+     x2="-1807.2"
+     gradientTransform="translate(1925.9953,9.9988343)"
+     y1="125.86"
+     x1="-1807.2"><stop
+       stop-color="#1b3967"
+       offset=".011"
+       id="stop4" /><stop
+       stop-color="#13b5ea"
+       offset=".467"
+       id="stop6" /><stop
+       stop-color="#002b5c"
+       offset=".9945"
+       id="stop8" /></linearGradient><path
+     d="m 146.28531,24.187835 c 0.077,1.313 -1.786,0.968 -1.786,2.293 0,38.551 -44.720002,96.831035 -89.847002,108.190035 l 0,1.182 C 114.60931,130.34287 181.38231,69.052835 182.89231,10.002834 l -36.6,14.189001 z"
+     id="path10"
+     style="fill:url(#SVGID_1_)"
+     inkscape:connector-curvature="0" /><path
+     d="m 130.22531,27.958835 c 0.077,1.313 0.121,2.633 0.121,3.958 0,38.551 -30.700002,90.497035 -75.827002,101.860035 l 0,1.637 c 59.065002,-3.823 105.810002,-63.023035 105.810002,-109.200035 0,-2.375 -0.125,-4.729 -0.371,-7.056 l -29.73,8.796 z"
+     id="path12"
+     inkscape:connector-curvature="0"
+     style="fill:#e96d1f" /><linearGradient
+     id="SVGID_2_"
+     y2="1.279e-13"
+     gradientUnits="userSpaceOnUse"
+     x2="-1073.2"
+     gradientTransform="matrix(-1,0,0,1,-998.20465,9.9988343)"
+     y1="126.85"
+     x1="-1073.2"><stop
+       stop-color="#1b3967"
+       offset=".011"
+       id="stop15" /><stop
+       stop-color="#13b5ea"
+       offset=".467"
+       id="stop17" /><stop
+       stop-color="#002b5c"
+       offset=".9945"
+       id="stop19" /></linearGradient><path
+     d="m 46.594308,24.187835 c -0.077,1.313 1.787,0.968 1.787,2.293 0,38.551 46.558,97.366035 91.688002,108.730035 l 0,1.639 C 80.116308,131.32987 11.509308,69.049835 9.9993079,9.9998343 L 46.598308,24.188835 Z"
+     id="path21"
+     style="fill:url(#SVGID_2_)"
+     inkscape:connector-curvature="0" /><path
+     d="m 64.726308,28.930835 c -0.076,1.313 -0.12,2.63 -0.12,3.957 0,38.551 30.699,90.497035 75.827002,101.860035 l 0,1.639 C 81.389308,133.59687 34.623308,73.362835 34.623308,27.186835 c 0,-2.375 0.128,-4.729 0.371,-7.056 l 29.73,8.798 z"
+     id="path23"
+     inkscape:connector-curvature="0"
+     style="fill:#a0ce67" /><path
+     d="m 34.708308,19.581835 7.617,2.722 c -0.041,0.962 -0.066,2.254 -0.066,3.225 0,41.219 37.271,98.204035 87.272002,107.120035 3.245,1.088 7.538,2.077 10.932,2.931 l 0,1.638 C 75.209308,131.65787 29.363308,65.351835 34.703308,19.577835 Z"
+     id="path25"
+     inkscape:connector-curvature="0"
+     style="fill:#439639" /><path
+     d="m 160.33531,18.758835 -7.833,2.625 c 0.041,0.963 0.191,2.203 0.191,3.173 0,41.219 -37.272,98.205035 -87.274002,107.120035 -3.243,1.089 -7.538,2.077 -10.93,2.932 l 0,1.639 C 122.83331,127.58787 165.66931,64.528835 160.32931,18.757835 Z"
+     id="path27"
+     inkscape:connector-curvature="0"
+     style="fill:#d9541e" /></svg>
@@ -1,97 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="535.00458"
-   height="510.4368"
-   id="svg3896"
   version="1.1"
-   inkscape:version="0.48+devel r"
-   sodipodi:docname="camera_icon_grey.svg">
-  <defs
-     id="defs3898" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="369.28572"
-     inkscape:cy="50.436783"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="954"
-     inkscape:window-height="711"
-     inkscape:window-x="129"
-     inkscape:window-y="144"
-     inkscape:window-maximized="0" />
+   id="svg2"
+   width="20"
+   height="20">
  <metadata
-     id="metadata3901">
+     id="metadata10">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
+  <defs
+     id="defs8" />
  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
     id="layer1"
-     transform="translate(-5.7142771,-72.362177)">
-    <rect
-       style="fill:#808080;stroke:none;stroke-width:1.6172694;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3904"
-       width="290.51404"
-       height="294.08438"
-       x="86.054779"
-       y="292.97778" />
+     transform="matrix(0.03788594,0,0,0.03788594,-0.41340793,-2.6310716)">
    <path
-       style="fill:#808080;stroke:none"
-       d="m 292.28572,420.35915 229.57599,-101.39986 0,232.54576 -233.04644,-102.93271 z"
       id="path3906"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
       style="fill:#808080;stroke:none"
-       id="path3908"
-       sodipodi:cx="242.85715"
-       sodipodi:cy="315.21933"
-       sodipodi:rx="117.14286"
-       sodipodi:ry="117.14286"
-       d="M 360.00001,315.21933 A 117.14286,117.14286 0 0 1 242.85715,432.36219 117.14286,117.14286 0 0 1 125.71429,315.21933 117.14286,117.14286 0 0 1 242.85715,198.07647 117.14286,117.14286 0 0 1 360.00001,315.21933 Z"
-       transform="matrix(1.1334136,0,0,1.1663886,-136.76164,-155.82534)" />
-    <a
-       id="a3912"
-       style="fill:#808080;stroke:none"
-       transform="matrix(0.86859739,0,0,0.89386794,47.913668,10.526572)">
-      <path
-         sodipodi:type="arc"
-         style="fill:#808080;stroke:none"
-         id="path3910"
-         sodipodi:cx="242.85715"
-         sodipodi:cy="315.21933"
-         sodipodi:rx="117.14286"
-         sodipodi:ry="117.14286"
-         d="M 360.00001,315.21933 A 117.14286,117.14286 0 0 1 242.85715,432.36219 117.14286,117.14286 0 0 1 125.71429,315.21933 117.14286,117.14286 0 0 1 242.85715,198.07647 117.14286,117.14286 0 0 1 360.00001,315.21933 Z"
-         transform="matrix(1.304878,0,0,1.304878,3.67247,-186.10345)" />
-    </a>
+       d="m 361.65148,313.51768 177.16074,-131.78516 0,302.22999 L 358.97338,350.18517 Z M 10.911922,182.40634 l 378.372678,0 0,302.65582 -378.372678,0 z" />
  </g>
 </svg>
@@ -13,8 +13,8 @@
   height="510.4368"
   id="svg3896"
   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="camera_icon.svg">
+   inkscape:version="0.48+devel r"
+   sodipodi:docname="camera_icon_white.svg">
  <defs
     id="defs3898" />
  <sodipodi:namedview
@@ -24,9 +24,9 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="369.28572"
-     inkscape:cy="50.436783"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="353.91934"
+     inkscape:cy="233.8456"
     inkscape:document-units="px"
     inkscape:current-layer="layer1"
     showgrid="false"
@@ -34,11 +34,11 @@
     fit-margin-left="0"
     fit-margin-right="0"
     fit-margin-bottom="0"
-     inkscape:window-width="954"
-     inkscape:window-height="711"
-     inkscape:window-x="833"
-     inkscape:window-y="106"
-     inkscape:window-maximized="0" />
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
  <metadata
     id="metadata3901">
    <rdf:RDF>
@@ -57,41 +57,16 @@
     id="layer1"
     transform="translate(-5.7142771,-72.362177)">
    <rect
-       style="fill:#ffffff;stroke:#ffffff;stroke-width:1.61726940000000008;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#ffffff;stroke:none;stroke-width:1.6172694;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="rect3904"
-       width="290.51404"
-       height="294.08438"
-       x="86.054779"
-       y="292.97778" />
+       width="378.37268"
+       height="302.65582"
+       x="10.911922"
+       y="182.40634" />
    <path
       style="fill:#ffffff;stroke:none"
-       d="m 292.28572,420.35915 229.57599,-101.39986 0,232.54576 -233.04644,-102.93271 z"
+       d="m 361.65148,313.51768 177.16074,-131.78516 0,302.22999 -179.83884,-133.77734 z"
       id="path3906"
       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ffffff;stroke:none"
-       id="path3908"
-       sodipodi:cx="242.85715"
-       sodipodi:cy="315.21933"
-       sodipodi:rx="117.14286"
-       sodipodi:ry="117.14286"
-       d="m 360.00001,315.21933 a 117.14286,117.14286 0 1 1 -234.28572,0 117.14286,117.14286 0 1 1 234.28572,0 z"
-       transform="matrix(1.1334136,0,0,1.1663886,-136.76164,-155.82534)" />
-    <a
-       id="a3912"
-       style="fill:#ffffff"
-       transform="matrix(0.86859739,0,0,0.89386794,47.913668,10.526572)">
-      <path
-         sodipodi:type="arc"
-         style="fill:#ffffff;stroke:none"
-         id="path3910"
-         sodipodi:cx="242.85715"
-         sodipodi:cy="315.21933"
-         sodipodi:rx="117.14286"
-         sodipodi:ry="117.14286"
-         d="m 360.00001,315.21933 c 0,64.69622 -52.44665,117.14286 -117.14286,117.14286 -64.69622,0 -117.14286,-52.44664 -117.14286,-117.14286 0,-64.69622 52.44664,-117.14286 117.14286,-117.14286 64.69621,0 117.14286,52.44664 117.14286,117.14286 z"
-         transform="matrix(1.304878,0,0,1.304878,3.67247,-186.10345)" />
-    </a>
  </g>
 </svg>
@@ -14,7 +14,7 @@
   inkscape:version="0.48+devel r"
   width="15"
   height="15"
-   sodipodi:docname="padlock_open-white.svg">
+   sodipodi:docname="padlock_close_green.svg">
  <metadata
     id="metadata3047">
    <rdf:RDF>
@@ -42,25 +42,45 @@
     inkscape:window-height="1056"
     id="namedview3043"
     showgrid="false"
-     inkscape:zoom="44.500587"
-     inkscape:cx="6.292871"
-     inkscape:cy="6.4926565"
+     inkscape:zoom="32"
+     inkscape:cx="12.823367"
+     inkscape:cy="8.9449238"
     inkscape:window-x="65"
     inkscape:window-y="24"
     inkscape:window-maximized="1"
     inkscape:current-layer="svg3041"
     borderlayer="true" />
  <rect
-     style="fill:#009800;stroke:#009800;stroke-width:0.92522794"
+     style="fill:#44aa00;stroke:#44aa00;stroke-width:0.92522794"
     id="rect3051"
     width="10.232394"
     height="6.4687548"
     x="2.5534275"
     y="8.074255" />
  <path
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:currentColor;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#009800;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.90384686;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     d="M 7.5078125,2.6797098 C 5.0260054,2.6797098 3.491603,3.472493 2.75,4.621116 2.008397,5.7697391 2.0878906,7.0238438 2.0878906,7.699241 l 1.9042969,0 c 0,-0.7329344 0.013699,-1.5125503 0.3574219,-2.0449218 0.3437231,-0.5323715 1.0433343,-1.0703125 3.1582031,-1.0703125 2.0264219,0 2.9669635,0.6265545 3.4326915,1.3827484 0.465728,0.7561939 0.400333,1.7142789 0.400333,1.7142789 0.04517,1.7732263 -0.06599,4.303173 0.0049,5.535784 l 0.05274,0.898438 0.898437,0 0.945445,-0.0031 0.01,-6.4361369 c 0,0 0.06201,-1.6621328 -0.685321,-2.8754827 C 11.819768,3.587152 10.078064,2.6797098 7.5078125,2.6797098 Z"
-     id="path3848"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ssccssscccccccs" />
+     style="fill:none;fill-opacity:1;stroke:#44aa00;stroke-width:2.08827519;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4101"
+     sodipodi:type="arc"
+     sodipodi:cx="7.6713805"
+     sodipodi:cy="6.7928491"
+     sodipodi:rx="4.534133"
+     sodipodi:ry="4.5301714"
+     sodipodi:start="3.1415927"
+     sodipodi:end="0"
+     d="M 3.1372476,6.7928489 A 4.534133,4.5301714 0 0 1 7.6713806,2.2626777 4.534133,4.5301714 0 0 1 12.205513,6.7928491"
+     sodipodi:open="true" />
+  <rect
+     style="fill:#44aa00;fill-opacity:1;stroke:none;stroke-width:1.39526081;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect4153"
+     width="2.0906768"
+     height="1.0984892"
+     x="2.0913804"
+     y="6.7554431" />
+  <rect
+     y="6.7632556"
+     x="11.157786"
+     height="1.0984892"
+     width="2.0906768"
+     id="rect4155"
+     style="fill:#44aa00;fill-opacity:1;stroke:none;stroke-width:1.39526081;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
@@ -14,7 +14,7 @@
   inkscape:version="0.48+devel r"
   width="15"
   height="15"
-   sodipodi:docname="padlock_open-white.svg">
+   sodipodi:docname="padlock_close_grey.svg">
  <metadata
     id="metadata3047">
    <rdf:RDF>
@@ -42,9 +42,9 @@
     inkscape:window-height="1056"
     id="namedview3043"
     showgrid="false"
-     inkscape:zoom="44.500587"
-     inkscape:cx="6.292871"
-     inkscape:cy="6.4926565"
+     inkscape:zoom="32"
+     inkscape:cx="12.792117"
+     inkscape:cy="8.9449238"
     inkscape:window-x="65"
     inkscape:window-y="24"
     inkscape:window-maximized="1"
@@ -57,10 +57,38 @@
     height="6.4687548"
     x="2.5534275"
     y="8.074255" />
-  <path
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:currentColor;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.90384686;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     d="M 7.5078125,2.6797098 C 5.0260054,2.6797098 3.491603,3.472493 2.75,4.621116 2.008397,5.7697391 2.0878906,7.0238438 2.0878906,7.699241 l 1.9042969,0 c 0,-0.7329344 0.013699,-1.5125503 0.3574219,-2.0449218 0.3437231,-0.5323715 1.0433343,-1.0703125 3.1582031,-1.0703125 2.0264219,0 2.9669635,0.6265545 3.4326915,1.3827484 0.465728,0.7561939 0.400333,1.7142789 0.400333,1.7142789 0.04517,1.7732263 -0.06599,4.303173 0.0049,5.535784 l 0.05274,0.898438 0.898437,0 0.945445,-0.0031 0.01,-6.4361369 c 0,0 0.06201,-1.6621328 -0.685321,-2.8754827 C 11.819768,3.587152 10.078064,2.6797098 7.5078125,2.6797098 Z"
-     id="path3848"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ssccssscccccccs" />
+  <a
+     id="a4157"
+     style="fill:none;stroke:#808080">
+    <path
+       sodipodi:open="true"
+       d="M 3.1372476,6.7928489 A 4.534133,4.5301714 0 0 1 7.6713806,2.2626777 4.534133,4.5301714 0 0 1 12.205513,6.7928491"
+       sodipodi:end="0"
+       sodipodi:start="3.1415927"
+       sodipodi:ry="4.5301714"
+       sodipodi:rx="4.534133"
+       sodipodi:cy="6.7928491"
+       sodipodi:cx="7.6713805"
+       sodipodi:type="arc"
+       id="path4101"
+       style="fill:none;fill-opacity:1;stroke:#808080;stroke-width:2.08827519;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </a>
+  <g
+     id="g4170"
+     style="fill:#808080">
+    <rect
+       y="6.7554431"
+       x="2.0913804"
+       height="1.0984892"
+       width="2.0906768"
+       id="rect4153"
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:1.39526081;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:1.39526081;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4155"
+       width="2.0906768"
+       height="1.0984892"
+       x="11.157786"
+       y="6.7632556" />
+  </g>
 </svg>
@@ -14,7 +14,7 @@
   inkscape:version="0.48+devel r"
   width="15"
   height="15"
-   sodipodi:docname="padlock_open-white.svg">
+   sodipodi:docname="padlock_close_orange.svg">
  <metadata
     id="metadata3047">
    <rdf:RDF>
@@ -42,25 +42,53 @@
     inkscape:window-height="1056"
     id="namedview3043"
     showgrid="false"
-     inkscape:zoom="44.500587"
-     inkscape:cx="6.292871"
-     inkscape:cy="6.4926565"
+     inkscape:zoom="32"
+     inkscape:cx="12.792117"
+     inkscape:cy="8.9449238"
     inkscape:window-x="65"
     inkscape:window-y="24"
     inkscape:window-maximized="1"
     inkscape:current-layer="svg3041"
     borderlayer="true" />
  <rect
-     style="fill:#ff9955;stroke:#ff9955;stroke-width:0.92522794"
+     style="fill:#ff7f2a;stroke:#ff7f2a;stroke-width:0.92522794"
     id="rect3051"
     width="10.232394"
     height="6.4687548"
     x="2.5534275"
     y="8.074255" />
-  <path
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:currentColor;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ff9955;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.90384686;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     d="M 7.5078125,2.6797098 C 5.0260054,2.6797098 3.491603,3.472493 2.75,4.621116 2.008397,5.7697391 2.0878906,7.0238438 2.0878906,7.699241 l 1.9042969,0 c 0,-0.7329344 0.013699,-1.5125503 0.3574219,-2.0449218 0.3437231,-0.5323715 1.0433343,-1.0703125 3.1582031,-1.0703125 2.0264219,0 2.9669635,0.6265545 3.4326915,1.3827484 0.465728,0.7561939 0.400333,1.7142789 0.400333,1.7142789 0.04517,1.7732263 -0.06599,4.303173 0.0049,5.535784 l 0.05274,0.898438 0.898437,0 0.945445,-0.0031 0.01,-6.4361369 c 0,0 0.06201,-1.6621328 -0.685321,-2.8754827 C 11.819768,3.587152 10.078064,2.6797098 7.5078125,2.6797098 Z"
-     id="path3848"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ssccssscccccccs" />
+  <a
+     id="a4157"
+     style="fill:none;stroke:#ff7f2a">
+    <path
+       sodipodi:open="true"
+       d="M 3.1372476,6.7928489 A 4.534133,4.5301714 0 0 1 7.6713806,2.2626777 4.534133,4.5301714 0 0 1 12.205513,6.7928491"
+       sodipodi:end="0"
+       sodipodi:start="3.1415927"
+       sodipodi:ry="4.5301714"
+       sodipodi:rx="4.534133"
+       sodipodi:cy="6.7928491"
+       sodipodi:cx="7.6713805"
+       sodipodi:type="arc"
+       id="path4101"
+       style="fill:none;fill-opacity:1;stroke:#ff7f2a;stroke-width:2.08827519;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </a>
+  <g
+     id="g4170"
+     style="fill:#ff7f2a">
+    <rect
+       y="6.7554431"
+       x="2.0913804"
+       height="1.0984892"
+       width="2.0906768"
+       id="rect4153"
+       style="fill:#ff7f2a;fill-opacity:1;stroke:none;stroke-width:1.39526081;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       style="fill:#ff7f2a;fill-opacity:1;stroke:none;stroke-width:1.39526081;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4155"
+       width="2.0906768"
+       height="1.0984892"
+       x="11.157786"
+       y="6.7632556" />
+  </g>
 </svg>
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25"
+   height="25"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 25 25.000001"
+   sodipodi:docname="speech_balloon_white.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="25.186628"
+     inkscape:cy="14.479999"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-228.24219,-320.66798)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 240.77627,324.02578 a 12.489309,7.9254426 0 0 0 -12.48944,7.92538 12.489309,7.9254426 0 0 0 5.26146,6.45637 c -0.17862,1.91196 -1.06119,3.95363 -3.14604,4.64437 2.54121,-0.11444 5.60026,-1.93057 7.47209,-3.40137 a 12.489309,7.9254426 0 0 0 2.90193,0.22616 12.489309,7.9254426 0 0 0 12.48928,-7.92553 12.489309,7.9254426 0 0 0 -12.48928,-7.92538 z"
+       id="path4101"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
@@ -1,5 +1,5 @@
-/**
- * jsxc v0.7.2 - 2014-05-28
+/*!
+ * jsxc v1.0.0 - 2014-11-06
 * 
 * Copyright (c) 2014 Klaus Herberth <klaus@jsxc.org> <br>
 * Released under the MIT license
@@ -7,15 +7,16 @@
 * Please see http://www.jsxc.org/
 * 
 * @author Klaus Herberth <klaus@jsxc.org>
- * @version 0.7.2
+ * @version 1.0.0
+ * @license MIT
 */

-/* jsxc, Strophe, SDPUtil, getUserMediaWithConstraints, setupRTC, jQuery */
+/* global jsxc, Strophe, SDPUtil, getUserMediaWithConstraints, setupRTC, jQuery, MediaStreamTrack */

 var RTC = null, RTCPeerconnection = null;

 jsxc.gui.template.incomingCall = '<h3>%%Incoming_call%%</h3>\
-        <p>%%Do_you_want_to_accept_the_call_from%% {{cid_name}}?</p>\
+        <p>%%Do_you_want_to_accept_the_call_from%% {{bid_name}}?</p>\
        <p class="jsxc_right">\
            <a href="#" class="button jsxc_reject">%%Reject%%</a> <a href="#" class="button creation jsxc_accept">%%Accept%%</a>\
         </p>';
@@ -23,10 +24,28 @@ jsxc.gui.template.incomingCall = '<h3>%%Incoming_call%%</h3>\
 jsxc.gui.template.allowMediaAccess = '<p>%%Please_allow_access_to_microphone_and_camera%%</p>';

 jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
+            <div class="jsxc_chatarea">\
+                <ul></ul>\
+            </div>\
            <div class="jsxc_videoContainer">\
                <video class="jsxc_localvideo" autoplay></video>\
                <video class="jsxc_remotevideo" autoplay></video>\
                <div class="jsxc_status"></div>\
+               <div class="bubblingG">\
+                  <span id="bubblingG_1">\
+                  </span>\
+                  <span id="bubblingG_2">\
+                  </span>\
+                  <span id="bubblingG_3">\
+                  </span>\
+               </div>\
+                <div class="jsxc_noRemoteVideo">\
+                   <div>\
+                     <div></div>\
+                     <p>%%No_video_signal%%</p>\
+                     <div></div>\
+                   </div>\
+                </div>\
            </div>\
            <div class="jsxc_controlbar">\
                <button type="button" class="jsxc_hangUp">%%hang_up%%</button>\
@@ -44,9 +63,9 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
               <div class="jsxc_snapshotbar">\
                   <p>No pictures yet!</p>\
               </div>\n\
-               <div class="jsxc_chatarea">\
+               <!--<div class="jsxc_chatarea">\
                   <ul></ul>\
-               </div>\
+               </div>-->\
               <div class="jsxc_infobar"></div>\
            </div>\
        </div>';
@@ -76,7 +95,7 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
      AUTO_ACCEPT: false,

      /** required disco features */
-      reqVideoFeatures: [ 'urn:xmpp:jingle:apps:rtp:video', 'urn:xmpp:jingle:apps:rtp:audio', 'urn:xmpp:jingle:transports:ice-udp:1' ],
+      reqVideoFeatures: [ 'urn:xmpp:jingle:apps:rtp:video', 'urn:xmpp:jingle:apps:rtp:audio', 'urn:xmpp:jingle:transports:ice-udp:1', 'urn:xmpp:jingle:apps:dtls:0' ],

      /** bare jid to current jid mapping */
      chatJids: {},
@@ -110,6 +129,7 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
         self.conn.jingle.pc_constraints = RTC.pc_constraints;

         $(document).on('message.jsxc', $.proxy(self.onMessage, self));
+         $(document).on('presence.jsxc', $.proxy(self.onPresence, self));

         $(document).on('mediaready.jingle', $.proxy(self.onMediaReady, self));
         $(document).on('mediafailure.jingle', $.proxy(self.onMediaFailure, self));
@@ -126,6 +146,10 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
            jsxc.error('[JINGLE]', error);
         });

+         if (self.conn.disco) {
+            self.conn.disco.addFeature('urn:xmpp:jingle:apps:dtls:0');
+         }
+
         if (self.conn.caps) {
            $(document).on('caps.strophe', $.proxy(self.onCaps, self));
         }
@@ -172,6 +196,62 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
         });
      },

+      /**
+       * Return list of video capable resources.
+       * 
+       * @memberOf jsxc.webrtc
+       * @param jid
+       * @returns {Array}
+       */
+      getCapableRes: function(jid) {
+         var self = jsxc.webrtc;
+         var bid = jsxc.jidToBid(jid);
+         var res = jsxc.storage.getUserItem('res', bid) || [];
+
+         var available = [];
+         $.each(res, function(r) {
+            if (self.conn.caps.hasFeatureByJid(bid + '/' + r, self.reqVideoFeatures)) {
+               available.push(r);
+            }
+         });
+
+         return available;
+      },
+
+      /**
+       * Add "video" button to roster
+       * 
+       * @private
+       * @memberOf jsxc.webrtc
+       * @param event
+       * @param bid bid of roster item
+       * @param data data wich belongs to bid
+       * @param el the roster item
+       */
+      onAddRosterItem: function(event, bid, data, el) {
+         var self = jsxc.webrtc;
+
+         if (!self.conn) {
+            $(document).one('connectionReady.jsxc', function() {
+               self.onAddRosterItem(null, bid, data, el);
+            });
+            return;
+         }
+
+         var videoIcon = $('<div class="jsxc_video jsxc_disabled" title="' + jsxc.l.Start_video_call + '"></div>');
+
+         videoIcon.click(function() {
+            self.startCall(data.jid);
+            return false;
+         });
+
+         el.find('.jsxc_options.jsxc_left').append(videoIcon);
+
+         el.on('extra.jsxc', function() {
+            self.updateIcon(bid);
+         });
+      },
+
      /**
       * Add "video" button to window menu.
       * 
@@ -183,6 +263,8 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
      initWindow: function(event, win) {
         var self = jsxc.webrtc;

+         jsxc.debug('webrtc.initWindow');
+
         if (!self.conn) {
            $(document).one('connectionReady.jsxc', function() {
               self.initWindow(null, win);
@@ -193,47 +275,50 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
         var div = $('<div>').addClass('jsxc_video');
         win.find('.jsxc_transfer:eq(1)').after(div);

-         self.updateWindow(win);
+         self.updateIcon(jsxc.jidToBid(win.data('jid')));
      },

      /**
-       * Enable or disable "video" button and assign full jid.
+       * Enable or disable "video" icon and assign full jid.
       * 
       * @memberOf jsxc.webrtc
-       * @param win jQuery window object
+       * @param bid CSS conform jid
       */
-      updateWindow: function(win) {
-         if (!win || win.length === 0) {
-            return;
-         }
+      updateIcon: function(bid) {
+         jsxc.debug('Update icon', bid);

         var self = jsxc.webrtc;
-         var jid = win.data('jid');
-         var li = win.find('.jsxc_video');
+         var win = jsxc.gui.window.get(bid);
+         var jid = win.data('jid') || jsxc.storage.getUserItem('buddy', bid).jid;

-         // only start video call to a full jid
-         if (Strophe.getResourceFromJid(jid) === null) {
-            var cid = jsxc.jidToCid(jid);
-            var res = jsxc.storage.getUserItem('buddy_' + cid).res;
+         var el = win.find('.jsxc_video').add(jsxc.gui.roster.getItem(bid).find('.jsxc_video'));

-            if (Array.isArray(res) && res.length === 1) {
-               jid += '/' + res[0];
-            }
+         var capableRes = self.getCapableRes(jid);
+         var targetRes = Strophe.getResourceFromJid(jid);
+
+         if (targetRes === null) {
+            $.each(jsxc.storage.getUserItem('buddy', bid).res, function(index, val) {
+               if (capableRes.indexOf(val) > -1) {
+                  targetRes = val;
+                  return false;
+               }
+            });
         }

-         li.off('click');
+         el.off('click');

-         if (self.conn.caps.hasFeatureByJid(jid, self.reqVideoFeatures)) {
-            li.click(function() {
-               self.startCall(jid);
+         if (capableRes.indexOf(targetRes) > -1) {
+            el.click(function() {
+               self.startCall(jid + '/' + targetRes);
            });
-            li.removeClass('jsxc_disabled');

-            li.attr('title', jsxc.translate('%%Start video call%%'));
+            el.removeClass('jsxc_disabled');
+
+            el.attr('title', jsxc.translate('%%Start video call%%'));
         } else {
-            li.addClass('jsxc_disabled');
+            el.addClass('jsxc_disabled');

-            li.attr('title', jsxc.translate('%%Video call not possible.%%'));
+            el.attr('title', jsxc.translate('%%Video call not possible.%%'));
         }
      },

@@ -247,14 +332,32 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
       */
      onMessage: function(e, from) {
         var self = jsxc.webrtc;
-         var bJid = Strophe.getBareJidFromJid(from);
+         var bid = jsxc.jidToBid(from);

-         if (self.chatJids[bJid] !== from) {
-            self.updateWindow(jsxc.gui.getWindow(jsxc.jidToCid(bJid)));
-            self.chatJids[bJid] = from;
+         jsxc.debug('webrtc.onmessage', from);
+
+         if (self.chatJids[bid] !== from) {
+            self.updateIcon(bid);
+            self.chatJids[bid] = from;
         }
      },

+      /**
+       * Update icon on presence.
+       * 
+       * @memberOf jsxc.webrtc
+       * @param ev
+       * @param status
+       * @private
+       */
+      onPresence: function(ev, jid) {
+         var self = jsxc.webrtc;
+
+         jsxc.debug('webrtc.onpresence', jid);
+
+         self.updateIcon(jsxc.jidToBid(jid));
+      },
+
      /**
       * Display status message to user.
       * 
@@ -312,11 +415,8 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
       */
      onCaps: function(event, jid) {
         var self = jsxc.webrtc;
-         var win = jsxc.gui.getWindow(jsxc.jidToCid(jid));

-         if (win.length > 0) {
-            self.updateWindow(win);
-         }
+         self.updateIcon(jsxc.jidToBid(jid));
      },

      /**
@@ -347,6 +447,7 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
            self.setStatus((stream.getVideoTracks().length > 0) ? 'Use local video device.' : 'No local video device.');

            jsxc.debug('using video device "' + stream.getVideoTracks()[i].label + '"');
+            $('#jsxc_dialog .jsxc_localvideo').show();
         }

         $(document).one('cleanup.dialog.jsxc', $.proxy(self.hangUp, self));
@@ -359,8 +460,11 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
       * @private
       * @memberOf jsxc.webrtc
       */
-      onMediaFailure: function() {
+      onMediaFailure: function(ev, err) {
         this.setStatus('media failure');
+
+         jsxc.gui.window.postMessage(jsxc.jidToBid(jsxc.webrtc.last_caller), 'sys', jsxc.translate('%%Media failure%%: ') + err.name);
+         jsxc.debug('media failure: ' + err.name);
      },

      /**
@@ -376,10 +480,12 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\

         var self = this;
         var sess = this.conn.jingle.sessions[sid];
-         var jid = jsxc.jidToCid(sess.peerjid);
+         var bid = jsxc.jidToBid(sess.peerjid);
+
+         jsxc.gui.window.postMessage(bid, 'sys', jsxc.translate('%%Incoming call.%%'));

         // display notification
-         jsxc.notification.notify(jsxc.translate('%%Incoming call%%'), jsxc.translate('%%from%% ' + jid));
+         jsxc.notification.notify(jsxc.translate('%%Incoming call%%'), jsxc.translate('%%from%% ' + bid));

         // send signal to partner
         sess.sendRinging();
@@ -407,7 +513,9 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
            return;
         }

-         var dialog = jsxc.gui.dialog.open(jsxc.gui.template.get('incomingCall', jsxc.jidToCid(jid)));
+         var dialog = jsxc.gui.dialog.open(jsxc.gui.template.get('incomingCall', bid), {
+            noClose: true
+         });

         dialog.find('.jsxc_accept').click(function() {
            $(document).trigger('accept.call.jsxc');
@@ -437,22 +545,30 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
      onCallTerminated: function(event, sid, reason, text) {
         this.setStatus('call terminated ' + sid + (reason ? (': ' + reason + ' ' + text) : ''));

+         var bid = jsxc.jidToBid(jsxc.webrtc.last_caller);
+
         if (this.localStream) {
            this.localStream.stop();
         }

-         $('.jsxc_remotevideo')[0].src = "";
-         $('.jsxc_localvideo')[0].src = "";
+         if ($('.jsxc_videoContainer').length) {
+            $('.jsxc_remotevideo')[0].src = "";
+            $('.jsxc_localvideo')[0].src = "";
+         }

         this.conn.jingle.localStream = null;
         this.localStream = null;
         this.remoteStream = null;

-         $('#jsxc_windowList > ul').prepend($('#jsxc_dialog .jsxc_chatarea > ul > li').detach());
+         var win = $('#jsxc_dialog .jsxc_chatarea > ul > li');
+         $('#jsxc_windowList > ul').prepend(win.detach());
+         win.find('.slimScrollDiv').resizable('enable');

         $(document).off('cleanup.dialog.jsxc');
         $(document).off('error.jingle');
         jsxc.gui.dialog.close();
+
+         jsxc.gui.window.postMessage(bid, 'sys', jsxc.translate('%%Call terminated%%' + (reason ? (': %%' + reason + '%%') : '') + '.'));
      },

      /**
@@ -494,7 +610,9 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
         this.setStatus(isAudioDevice ? 'Use remote audio device.' : 'No remote audio device');

         if ($('.jsxc_remotevideo').length) {
-            RTC.attachMediaStream($('.jsxc_remotevideo'), stream);
+            RTC.attachMediaStream($('#jsxc_dialog .jsxc_remotevideo'), stream);
+
+            $('#jsxc_dialog .jsxc_' + (isVideoDevice ? 'remotevideo' : 'noRemoteVideo')).addClass('jsxc_deviceAvailable');
         }
      },

@@ -528,7 +646,11 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
         jsxc.debug('iceCon state for ' + sid, iceCon);
         jsxc.debug('sig state for ' + sid, sigState);

-         if (sigState === 'stable' && iceCon === 'connected') {
+         if (sigState === 'stable' && (iceCon === 'connected' || iceCon === 'completed')) {
+
+            $('#jsxc_dialog .jsxc_deviceAvailable').show();
+            $('#jsxc_dialog .bubblingG').hide();
+
            var localSDP = sess.peerconnection.localDescription.sdp;
            var remoteSDP = sess.peerconnection.remoteDescription.sdp;

@@ -557,6 +679,15 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
            text += '</p>';

            $('#jsxc_dialog .jsxc_infobar').html(text);
+         } else if (iceCon === 'failed') {
+            jsxc.gui.window.postMessage(jsxc.jidToBid(sess.peerjid), 'sys', jsxc.translate('%%ICE connection failure%%.'));
+
+            $(document).off('cleanup.dialog.jsxc');
+
+            sess.sendTerminate('failed-transport');
+            sess.terminate();
+
+            $(document).trigger('callterminated.jingle');
         }
      },

@@ -575,8 +706,9 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
       * 
       * @memberOf jsxc.webrtc
       * @param jid full jid
+       * @param um requested user media
       */
-      startCall: function(jid) {
+      startCall: function(jid, um) {
         var self = this;

         if (Strophe.getResourceFromJid(jid) === null) {
@@ -590,6 +722,8 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
            'finish.mediaready.jsxc': function() {
               self.setStatus('Initiate call');

+               jsxc.gui.window.postMessage(jsxc.jidToBid(jid), 'sys', jsxc.translate('%%Call started.%%'));
+
               $(document).one('error.jingle', function(e, sid, error) {
                  if (error.source !== 'offer') {
                     return;
@@ -608,7 +742,7 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
            }
         });

-         this.reqUserMedia();
+         self.reqUserMedia(um);
      },

      /**
@@ -616,10 +750,10 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
       * 
       * @memberOf jsxc.webrtc
       */
-      hangUp: function() {
+      hangUp: function(reason, text) {
         $(document).off('cleanup.dialog.jsxc');

-         jsxc.webrtc.conn.jingle.terminate(null);
+         jsxc.webrtc.conn.jingle.terminate(null, reason, text);
         $(document).trigger('callterminated.jingle');
      },

@@ -628,24 +762,41 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
       * 
       * @memberOf jsxc.webrtc
       */
-      reqUserMedia: function() {
+      reqUserMedia: function(um) {
         if (this.localStream) {
            $(document).trigger('mediaready.jingle', [ this.localStream ]);
            return;
         }

+         um = um || [ 'video', 'audio' ];
+
         jsxc.gui.dialog.open(jsxc.gui.template.get('allowMediaAccess'), {
            noClose: true
         });
         this.setStatus('please allow access to microphone and camera');

-         getUserMediaWithConstraints([ 'video', 'audio' ]);
+         if (typeof MediaStreamTrack !== 'undefined' && typeof MediaStreamTrack.getSources !== 'undefined') {
+            MediaStreamTrack.getSources(function(sourceInfo) {
+               var availableDevices = sourceInfo.map(function(el) {
+
+                  return el.kind;
+               });
+
+               um = um.filter(function(el) {
+                  return availableDevices.indexOf(el) !== -1;
+               });
+
+               getUserMediaWithConstraints(um);
+            });
+         } else {
+            getUserMediaWithConstraints(um);
+         }
      },

      /**
       * Make a snapshot from a video stream and display it.
       * 
-       * @memberOf
+       * @memberOf jsxc.webrtc
       * @param video Video stream
       */
      snapshot: function(video) {
@@ -663,7 +814,15 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\

         ctx.drawImage(video[0], 0, 0);
         var img = $('<img/>');
-         var url = canvas.toDataURL('image/jpeg');
+         var url = null;
+
+         try {
+            url = canvas.toDataURL('image/jpeg');
+         } catch (err) {
+            jsxc.warn('Error', err);
+            return;
+         }
+
         img[0].src = url;
         var link = $('<a/>').attr({
            target: '_blank',
@@ -721,6 +880,8 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\

         if (self.remoteStream) {
            RTC.attachMediaStream(rv, self.remoteStream);
+
+            $('#jsxc_dialog .jsxc_' + (self.remoteStream.getVideoTracks().length > 0 ? 'remotevideo' : 'noRemoteVideo')).addClass('jsxc_deviceAvailable');
         }

         var toggleMulti = function(elem, open) {
@@ -737,7 +898,13 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
            }
         };

-         var win = jsxc.gui.window.open(jsxc.jidToCid(jid));
+         var win = jsxc.gui.window.open(jsxc.jidToBid(jid));
+
+         win.find('.slimScrollDiv').resizable('disable');
+         win.find('.jsxc_textarea').slimScroll({
+            height: 413
+         });
+         win.find('.jsxc_emoticons').css('top', (413 + 6) + 'px');

         $('#jsxc_dialog .jsxc_chatarea ul').append(win.detach());

@@ -755,7 +922,21 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
         });

         $('#jsxc_dialog .jsxc_showchat').click(function() {
-            toggleMulti($('#jsxc_dialog .jsxc_chatarea'));
+            var chatarea = $('#jsxc_dialog .jsxc_chatarea');
+
+            if (chatarea.is(':hidden')) {
+               chatarea.show();
+               $('#jsxc_dialog .jsxc_webrtc').width('900');
+               jsxc.gui.dialog.resize({
+                  width: '920px'
+               });
+            } else {
+               chatarea.hide();
+               $('#jsxc_dialog .jsxc_webrtc').width('650');
+               jsxc.gui.dialog.resize({
+                  width: '660px'
+               });
+            }
         });

         $('#jsxc_dialog .jsxc_info').click(function() {
@@ -799,13 +980,14 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
      if (RTC !== null) {
         RTCPeerconnection = RTC.peerconnection;

+         $(document).on('add.roster.jsxc', jsxc.webrtc.onAddRosterItem);
         $(document).on('init.window.jsxc', jsxc.webrtc.initWindow);
         $(document).on('attached.jsxc', jsxc.webrtc.init);
      }
   });

   $.extend(jsxc.l10n.en, {
-      Please_allow_access_to_microphone_and_camera: 'Please allow access to microphone and camera.',
+      Please_allow_access_to_microphone_and_camera: 'Please click the "Allow" button at the top, to allow access to microphone and camera.',
      Incoming_call: 'Incoming call',
      from: 'from',
      Do_you_want_to_accept_the_call_from: 'Do you want to accept the call from',
@@ -821,12 +1003,12 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
      Remote_IP: 'Remote IP',
      Local_Fingerprint: 'Local fingerprint',
      Remote_Fingerprint: 'Remote fingerprint',
-      Video_call_not_possible: 'Video call not possible',
+      Video_call_not_possible: 'Video call not possible. Your buddy does not support video calls.',
      Start_video_call: 'Start video call'
   });

   $.extend(jsxc.l10n.de, {
-      Please_allow_access_to_microphone_and_camera: 'Bitte erlaube den Zugriff auf Kamera und Mikrofon.',
+      Please_allow_access_to_microphone_and_camera: 'Bitte klick auf den "Zulassen" Button oben, um den Zugriff auf Kamera und Mikrofon zu erlauben.',
      Incoming_call: 'Eingehender Anruf',
      from: 'von',
      Do_you_want_to_accept_the_call_from: 'Möchtest Du den Anruf annehmen von',
@@ -842,7 +1024,28 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
      Remote_IP: 'Remote IP',
      Local_Fingerprint: 'Lokaler Fingerprint',
      Remote_Fingerprint: 'Remote Fingerprint',
-      Video_call_not_possible: 'Videoanruf nicht verfügbar',
+      Video_call_not_possible: 'Videoanruf nicht verfügbar. Dein Gesprächspartner unterstützt keine Videotelefonie.',
      Start_video_call: 'Starte Videoanruf'
   });
+
+   $.extend(jsxc.l10n.es, {
+      Please_allow_access_to_microphone_and_camera: 'Por favor, permitir el acceso al micrófono y la cámara.',
+      Incoming_call: 'Llamada entrante',
+      from: 'de',
+      Do_you_want_to_accept_the_call_from: 'Desea aceptar la llamada de',
+      Reject: 'Rechazar',
+      Accept: 'Aceptar',
+      hang_up: 'colgar',
+      snapshot: 'instantánea',
+      mute_my_audio: 'silenciar mi audio',
+      pause_my_video: 'pausar mi vídeo',
+      fullscreen: 'pantalla completa',
+      Info: 'Info',
+      Local_IP: 'IP local',
+      Remote_IP: 'IP remota',
+      Local_Fingerprint: 'Firma digital local',
+      Remote_Fingerprint: 'Firma digital remota',
+      Video_call_not_possible: 'Llamada de vídeo no es posible',
+      Start_video_call: 'Iniciar llamada de vídeo'
+   });
 }(jQuery));
@@ -1,17 +1,34 @@
+.jsxc_webrtc {
+	width: 900px;
+}
+
+.jsxc_webrtc li .jsxc_name {
+	cursor: auto;
+}
+
+.jsxc_webrtc li .jsxc_name:hover {
+	color: #939393;
+}
+
 .jsxc_videoContainer {
 	width: 640px;
 	height: 480px;
 	position: relative;
+	background-color: #a4a4a4;
 }

-.jsxc_remotevideo {
+.jsxc_videoContainer video, .jsxc_videoContainer .jsxc_noRemoteVideo {
+	display: none;
+}
+
+.jsxc_remotevideo, .jsxc_noRemoteVideo {
 	width: 100%;
 	height: 100%;
 	position: absolute;
 	top: 0px;
 	left: 0px;
 	z-index: 9000;
-	background-color: grey;
+	background-color: #a4a4a4;
 }

 .jsxc_localvideo {
@@ -25,6 +42,49 @@
 	cursor: pointer;
 }

+.jsxc_noRemoteVideo p {
+	position: absolute;
+	bottom: 0px;
+	left:0px;
+	text-align: center;
+	color: #fff;
+	width: 100%;
+	z-index: 100;
+}
+
+.jsxc_noRemoteVideo > div {
+	width: 200px;
+	height: 200px;
+	overflow: hidden;
+	position: absolute;
+	top: 50%;
+	margin-top: -100px;
+	left: 50%;
+	margin-left: -100px;
+}
+
+.jsxc_noRemoteVideo > div > div {
+	background-color: #717171;
+}
+
+.jsxc_noRemoteVideo > div > div:first-child {
+	width: 50%;
+	height: 50%;
+	border-radius: 50%;
+	position: absolute;
+	left: 50%;
+	margin-left: -25%;
+	top: 10%;
+}
+
+.jsxc_noRemoteVideo > div > div:last-child {
+   position: absolute;
+	bottom: -50%;
+	width: 100%;
+	height: 100%;
+	border-radius: 50%;
+}
+
 .jsxc_webrtc .jsxc_status {
 	z-index: 9999;
 	border-radius: 20px;
@@ -40,6 +100,10 @@
 	text-align: center;
 }

+.jsxc_webrtc .slimScrollDiv {
+	opacity: 1 !important;
+}
+
 div:-moz-full-screen {
 	width: 100%;
 	height: 100%;
@@ -84,6 +148,14 @@ div:fullscreen.jsxc_localvideo {
 	border: 1px solid white;
 }

+.jsxc_controlbar {
+	width: 640px;
+}
+
+.jsxc_controlbar .jsxc_showchat {
+	float: right;
+}
+
 .jsxc_multi>div {
 	display: none;
 }
@@ -115,32 +187,33 @@ div:fullscreen.jsxc_localvideo {

 .jsxc_chatarea {
 	position: relative;
-	height: 255px;
-	display: none;
+	float:right;
+	height: 480px;
+	width: 250px;
 	background-color: #A4A4A4;
 }

-.jsxc_chatarea ul {
-	position: absolute;
-	left: 50%;
-	top: 0px;
-	width: 200px;
-	height: 255px;
+.jsxc_chatarea > ul {
+	width: 250px;
+	height: 480px;
 	list-style: none;
 	padding: 0px;
-	margin: 0px 0px 0px -100px;
 }

 .jsxc_chatarea .jsxc_settings {
-	display: none;
+	display: none !important;
 }

 .jsxc_chatarea .jsxc_close {
-	display: none;
+	display: none !important;
+}
+
+.jsxc_chatarea .jsxc_video {
+   display: none !important;
 }

 .jsxc_chatarea .jsxc_bar {
-	display: none;
+
 }

 .jsxc_chatarea .jsxc_window {
@@ -153,18 +226,154 @@ div:fullscreen.jsxc_localvideo {
 }

 div.jsxc_video {
-   padding: 3px;
-   width: 17px;
-   height: 17px;
   background-image: url('img/camera_icon_grey.svg');
   background-repeat: no-repeat;
   background-position: center center;
   background-size: 15px 15px;
-   cursor: pointer;
-   float: left;
 }

-div.jsxc_video.jsxc_disabled {
-	opacity: 0.5;
-	cursor: default;
-}
+div.jsxc_video:not(.jsxc_disabled):hover, #jsxc_buddylist .jsxc_options .jsxc_video {
+    background-image: url('img/camera_icon_white.svg');
+}
+
+#jsxc_buddylist .jsxc_options .jsxc_video.jsxc_disabled {
+	opacity: 0.2;
+}
+
+.bubblingG {
+text-align: center;
+width:129px;
+height:80px;
+position: absolute;
+top: 40%;
+left: 50%;
+margin-left: -64px;
+}
+
+.bubblingG span {
+display: inline-block;
+vertical-align: middle;
+width: 16px;
+height: 16px;
+margin: 40px auto;
+background: #000000;
+-moz-border-radius: 81px;
+-moz-animation: bubblingG 1.3s infinite alternate;
+-webkit-border-radius: 81px;
+-webkit-animation: bubblingG 1.3s infinite alternate;
+-ms-border-radius: 81px;
+-ms-animation: bubblingG 1.3s infinite alternate;
+-o-border-radius: 81px;
+-o-animation: bubblingG 1.3s infinite alternate;
+border-radius: 81px;
+animation: bubblingG 1.3s infinite alternate;
+}
+
+#bubblingG_1 {
+-moz-animation-delay: 0s;
+-webkit-animation-delay: 0s;
+-ms-animation-delay: 0s;
+-o-animation-delay: 0s;
+animation-delay: 0s;
+}
+
+#bubblingG_2 {
+-moz-animation-delay: 0.39s;
+-webkit-animation-delay: 0.39s;
+-ms-animation-delay: 0.39s;
+-o-animation-delay: 0.39s;
+animation-delay: 0.39s;
+}
+
+#bubblingG_3 {
+-moz-animation-delay: 0.78s;
+-webkit-animation-delay: 0.78s;
+-ms-animation-delay: 0.78s;
+-o-animation-delay: 0.78s;
+animation-delay: 0.78s;
+}
+
+@-moz-keyframes bubblingG {
+0% {
+width: 16px;
+height: 16px;
+background-color:#000000;
+-moz-transform: translateY(0);
+}
+
+100% {
+width: 39px;
+height: 39px;
+background-color:#FFFFFF;
+-moz-transform: translateY(-34px);
+}
+
+}
+
+@-webkit-keyframes bubblingG {
+0% {
+width: 16px;
+height: 16px;
+background-color:#000000;
+-webkit-transform: translateY(0);
+}
+
+100% {
+width: 39px;
+height: 39px;
+background-color:#FFFFFF;
+-webkit-transform: translateY(-34px);
+}
+
+}
+
+@-ms-keyframes bubblingG {
+0% {
+width: 16px;
+height: 16px;
+background-color:#000000;
+-ms-transform: translateY(0);
+}
+
+100% {
+width: 39px;
+height: 39px;
+background-color:#FFFFFF;
+-ms-transform: translateY(-34px);
+}
+
+}
+
+@-o-keyframes bubblingG {
+0% {
+width: 16px;
+height: 16px;
+background-color:#000000;
+-o-transform: translateY(0);
+}
+
+100% {
+width: 39px;
+height: 39px;
+background-color:#FFFFFF;
+-o-transform: translateY(-34px);
+}
+
+}
+
+@keyframes bubblingG {
+0% {
+width: 16px;
+height: 16px;
+background-color:#000000;
+transform: translateY(0);
+}
+
+100% {
+width: 39px;
+height: 39px;
+background-color:#FFFFFF;
+transform: translateY(-34px);
+}
+
+}
@@ -2,35 +2,81 @@
 * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
 * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
 *
- * Version: 1.0.0
- * 
+ * Version: 1.3.3 + pr#94
+ *
 */
 (function($) {

-  jQuery.fn.extend({
+  $.fn.extend({
    slimScroll: function(options) {

      var defaults = {
-        wheelStep : 20,
+
+        // width in pixels of the visible scroll area
        width : 'auto',
+
+        // height in pixels of the visible scroll area
        height : '250px',
+
+        // width in pixels of the scrollbar and rail
        size : '7px',
+
+        // scrollbar color, accepts any hex/color value
        color: '#000',
+
+        // scrollbar position - left/right
        position : 'right',
+
+        // distance in pixels between the side edge and the scrollbar
        distance : '1px',
+
+        // default scroll position on load - top / bottom / $('selector')
        start : 'top',
+
+        // sets scrollbar opacity
        opacity : .4,
+
+        // enables always-on mode for the scrollbar
        alwaysVisible : false,
-        disableFadeOut: false,
+
+        // check if we should hide the scrollbar when user is hovering over
+        disableFadeOut : false,
+
+        // sets visibility of the rail
        railVisible : false,
+
+        // sets rail color
        railColor : '#333',
-        railOpacity : '0.2',
+
+        // sets rail opacity
+        railOpacity : .2,
+
+        // whether  we should use jQuery UI Draggable to enable bar dragging
+        railDraggable : true,
+
+        // defautlt CSS class of the slimscroll rail
        railClass : 'slimScrollRail',
+
+        // defautlt CSS class of the slimscroll bar
        barClass : 'slimScrollBar',
+
+        // defautlt CSS class of the slimscroll wrapper
        wrapperClass : 'slimScrollDiv',
+
+        // check if mousewheel should scroll the window if we reach top/bottom
        allowPageScroll : false,
-        scroll : 0,
-        touchScrollStep : 200
+
+        // scroll amount applied to each mouse wheel step
+        wheelStep : 20,
+
+        // scroll amount applied when user is using gestures
+        touchScrollStep : 200,
+
+        // sets border radius
+        borderRadius: '7px',
+
+        // sets border radius of the rail
+        railBorderRadius : '7px'
      };

      var o = $.extend(defaults, options);
@@ -38,7 +84,7 @@
      // do it for every element that matches selector
      this.each(function(){

-      var isOverPanel, isOverBar, isDragg, queueHide, touchDif, 
+      var isOverPanel, isOverBar, isDragg, queueHide, touchDif,
        barHeight, percentScroll, lastScroll,
        divS = '<div></div>',
        minBarHeight = 30,
@@ -48,20 +94,33 @@
        var me = $(this);

        // ensure we are not binding it again
-        if (me.parent().hasClass('slimScrollDiv'))
-        { 
+        if (me.parent().hasClass(o.wrapperClass))
+        {
            // start from last bar position
            var offset = me.scrollTop();

            // find bar and rail
-            bar = me.parent().find('.slimScrollBar');
-            rail = me.parent().find('.slimScrollRail');
-            
+            bar = me.parent().find('.' + o.barClass);
+            rail = me.parent().find('.' + o.railClass);
+
            getBarHeight();

            // check if we should scroll existing instance
-            if (options)
+            if ($.isPlainObject(options))
            {
+              // Pass height: auto to an existing slimscroll object to force a resize after contents have changed
+              if ( 'height' in options && options.height == 'auto' ) {
+                me.parent().css('height', 'auto');
+                me.css('height', 'auto');
+                var height = me.parent().parent().height();
+                me.parent().css('height', height);
+                me.css('height', height);
+              } else if ('height' in options) {
+                var h = options.height;
+                me.parent().css('height', h);
+                me.css('height', h);
+              }
+
              if ('scrollTo' in options)
              {
                // jump to a static point
@@ -72,6 +131,14 @@
                // jump by value pixels
                offset += parseInt(o.scrollBy);
              }
+              else if ('destroy' in options)
+              {
+                // remove slimscroll elements
+                bar.remove();
+                rail.remove();
+                me.unwrap();
+                return;
+              }

              // scroll content by the given offset
              scrollContent(offset, false, true);
@@ -79,9 +146,16 @@

            return;
        }
+        else if ($.isPlainObject(options))
+        {
+            if ('destroy' in options)
+            {
+               return;
+            }
+        }

        // optionally set height to the parent's height
-        o.height = (o.height == 'auto') ? me.parent().innerHeight() : o.height;
+        o.height = (o.height == 'auto') ? me.parent().height() : o.height;

        // wrap content
        var wrapper = $(divS)
@@ -101,7 +175,7 @@
        });

        // create scrollbar rail
-        var rail  = $(divS)
+        var rail = $(divS)
          .addClass(o.railClass)
          .css({
            width: o.size,
@@ -109,7 +183,7 @@
            position: 'absolute',
            top: 0,
            display: (o.alwaysVisible && o.railVisible) ? 'block' : 'none',
-            'border-radius': o.size,
+            'border-radius': o.railBorderRadius,
            background: o.railColor,
            opacity: o.railOpacity,
            zIndex: 90
@@ -125,10 +199,10 @@
            top: 0,
            opacity: o.opacity,
            display: o.alwaysVisible ? 'block' : 'none',
-            'border-radius' : o.size,
-            BorderRadius: o.size,
-            MozBorderRadius: o.size,
-            WebkitBorderRadius: o.size,
+            'border-radius' : o.borderRadius,
+            BorderRadius: o.borderRadius,
+            MozBorderRadius: o.borderRadius,
+            WebkitBorderRadius: o.borderRadius,
            zIndex: 99
          });

@@ -144,18 +218,31 @@
        me.parent().append(bar);
        me.parent().append(rail);

-        // make it draggable
-        bar.draggable({ 
-          axis: 'y', 
-          containment: 'parent',
-          start: function() { isDragg = true; },
-          stop: function() { isDragg = false; hideBar(); },
-          drag: function(e) 
-          { 
-            // scroll content
-            scrollContent(0, $(this).position().top, false);
-          }
-        });
+        // make it draggable and no longer dependent on the jqueryUI
+        if (o.railDraggable){
+          bar.bind("mousedown", function(e) {
+            var $doc = $(document);
+            isDragg = true;
+            t = parseFloat(bar.css('top'));
+            pageY = e.pageY;
+
+            $doc.bind("mousemove.slimscroll", function(e){
+              currTop = t + e.pageY - pageY;
+              bar.css('top', currTop);
+              scrollContent(0, bar.position().top, false);// scroll content
+            });
+
+            $doc.bind("mouseup.slimscroll", function(e) {
+              isDragg = false;hideBar();
+              $doc.unbind('.slimscroll');
+            });
+            return false;
+          }).bind("selectstart.slimscroll", function(e){
+            e.stopPropagation();
+            e.preventDefault();
+            return false;
+          });
+        }

        // on rail over
        rail.hover(function(){
@@ -191,18 +278,44 @@
        });

        me.bind('touchmove', function(e){
-          // prevent scrolling the page
-          e.originalEvent.preventDefault();
+          // prevent scrolling the page if necessary
+          if(!releaseScroll)
+          {
+            e.originalEvent.preventDefault();
+            }
          if (e.originalEvent.touches.length)
          {
            // see how far user swiped
            var diff = (touchDif - e.originalEvent.touches[0].pageY) / o.touchScrollStep;
            // scroll content
            scrollContent(diff, true);
+            touchDif = e.originalEvent.touches[0].pageY;
          }
        });

-        var _onWheel = function(e)
+        // set up initial height
+        getBarHeight();
+
+        // check start position
+        if (o.start === 'bottom')
+        {
+          // scroll content to bottom
+          bar.css({ top: me.outerHeight() - bar.outerHeight() });
+          scrollContent(0, true);
+        }
+        else if (o.start !== 'top')
+        {
+          // assume jQuery selector
+          scrollContent($(o.start).position().top, null, true);
+
+          // make sure bar stays hidden
+          if (!o.alwaysVisible) { bar.hide(); }
+        }
+
+        // attach scroll events
+        attachWheel();
+
+        function _onWheel(e)
        {
          // use mouse wheel only when mouse is over
          if (!isOverPanel) { return; }
@@ -213,8 +326,11 @@
          if (e.wheelDelta) { delta = -e.wheelDelta/120; }
          if (e.detail) { delta = e.detail / 3; }

-          // scroll content
-          scrollContent(delta, true);
+          var target = e.target || e.srcTarget || e.srcElement;
+          if ($(target).closest('.' + o.wrapperClass).is(me.parent())) {
+            // scroll content
+            scrollContent(delta, true);
+          }

          // stop window scroll
          if (e.preventDefault && !releaseScroll) { e.preventDefault(); }
@@ -223,16 +339,24 @@

        function scrollContent(y, isWheel, isJump)
        {
+          releaseScroll = false;
          var delta = y;
          var maxTop = me.outerHeight() - bar.outerHeight();
-          
+
          if (isWheel)
          {
            // move bar with mouse wheel
            delta = parseInt(bar.css('top')) + y * parseInt(o.wheelStep) / 100 * bar.outerHeight();

-            // move bar, make sure it doesn't go out  
+            // move bar, make sure it doesn't go out
            delta = Math.min(Math.max(delta, 0), maxTop);
+
+            // if scrolling down, make sure a fractional change to the
+            // scroll position isn't rounded away when the scrollbar's CSS is set
+            // this flooring of delta would happened automatically when
+            // bar.css is set below, but we floor here for clarity
+            delta = (y > 0) ? Math.ceil(delta) : Math.floor(delta);
+
            // scroll the scrollbar
            bar.css({ top: delta + 'px' });
          }
@@ -245,7 +369,6 @@
          {
            delta = y;
            var offsetTop = delta / me[0].scrollHeight * me.outerHeight();
-
            offsetTop = Math.min(Math.max(offsetTop, 0), maxTop);
            bar.css({ top: offsetTop + 'px' });
          }
@@ -253,6 +376,9 @@
          // scroll content
          me.scrollTop(delta);

+          // fire scrolling event
+          me.trigger('slimscrolling', ~~delta);
+
          // ensure bar is visible
          showBar();

@@ -260,31 +386,29 @@
          hideBar();
        }

-        var attachWheel = function()
+        function attachWheel()
        {
          if (window.addEventListener)
          {
            this.addEventListener('DOMMouseScroll', _onWheel, false );
            this.addEventListener('mousewheel', _onWheel, false );
-          } 
+          }
          else
          {
            document.attachEvent("onmousewheel", _onWheel)
          }
        }

-        // attach scroll events
-        attachWheel();
-
        function getBarHeight()
        {
          // calculate scrollbar height and make sure it is not too small
          barHeight = Math.max((me.outerHeight() / me[0].scrollHeight) * me.outerHeight(), minBarHeight);
          bar.css({ height: barHeight + 'px' });
-        }

-        // set up initial height
-        getBarHeight();
+          // hide scrollbar if content is not long enough
+          var display = barHeight == me.outerHeight() ? 'none' : 'block';
+          bar.css({ display: display });
+        }

        function showBar()
        {
@@ -293,18 +417,22 @@
          clearTimeout(queueHide);

          // when bar reached top or bottom
-          if (percentScroll == ~~ percentScroll)
+          if (percentScroll == ~~percentScroll)
          {
-            //release wheel 
+            //release wheel
            releaseScroll = o.allowPageScroll;
-            
+
            // publish approporiate event
            if (lastScroll != percentScroll)
            {
-                var msg = (~~percentScroll == 0) ? 'top' : 'bottom'; 
+                var msg = (~~percentScroll == 0) ? 'top' : 'bottom';
                me.trigger('slimscroll', msg);
            }
          }
+          else
+          {
+            releaseScroll = false;
+          }
          lastScroll = percentScroll;

          // show only when required
@@ -324,7 +452,7 @@
          {
            queueHide = setTimeout(function(){
              if (!(o.disableFadeOut && isOverPanel) && !isOverBar && !isDragg)
-              { 
+              {
                bar.fadeOut('slow');
                rail.fadeOut('slow');
              }
@@ -332,30 +460,15 @@
          }
        }

-        // check start position
-        if (o.start == 'bottom') 
-        {
-          // scroll content to bottom
-          bar.css({ top: me.outerHeight() - bar.outerHeight() });
-          scrollContent(0, true);
-        }
-        else if (typeof o.start == 'object')
-        {
-          // scroll content
-          scrollContent($(o.start).position().top, null, true);
-
-          // make sure bar stays hidden
-          if (!o.alwaysVisible) { bar.hide(); }
-        }
      });
-      
+
      // maintain chainability
      return this;
    }
  });

-  jQuery.fn.extend({
-    slimscroll: jQuery.fn.slimScroll
+  $.fn.extend({
+    slimscroll: $.fn.slimScroll
  });

 })(jQuery);
@@ -1,6 +1,6 @@
 /*!

-  otr.js v0.2.11 - 2014-03-24
+  otr.js v0.2.13 - 2014-09-07
  (c) 2014 - Arlo Breault <arlolra@gmail.com>
  Freely distributed under the MPL v2.0 license.

@@ -141,6 +141,17 @@
    child.__super__ = parent.prototype
  }

+  // assumes 32-bit
+  function intCompare(x, y) {
+    var z = ~(x ^ y)
+    z &= z >> 16
+    z &= z >> 8
+    z &= z >> 4
+    z &= z >> 2
+    z &= z >> 1
+    return z & 1
+  }
+
  // constant-time string comparison
  HLP.compare = function (str1, str2) {
    if (str1.length !== str2.length)
@@ -148,7 +159,7 @@
    var i = 0, result = 0
    for (; i < str1.length; i++)
      result |= str1[i].charCodeAt(0) ^ str2[i].charCodeAt(0)
-    return result === 0
+    return intCompare(result, 0)
  }

  HLP.randomExponent = function () {
@@ -1160,7 +1171,7 @@
      HLP.debug.call(this.otr, 'success')

      if (BigInt.equals(this.their_y, this.our_dh.publicKey))
-        return this.otr.error('equal keys - we have a problem.', true)
+        return this.otr.error('equal keys - we have a problem.')

      this.otr.our_old_dh = this.our_dh
      this.otr.their_priv_pk = this.their_priv_pk
@@ -1267,7 +1278,7 @@

          // verify gy is legal 2 <= gy <= N-2
          if (!HLP.checkGroup(this.their_y, N_MINUS_2))
-            return this.otr.error('Illegal g^y.', true)
+            return this.otr.error('Illegal g^y.')

          this.createKeys(this.their_y)

@@ -1303,11 +1314,11 @@
          var hash = CryptoJS.SHA256(CryptoJS.enc.Latin1.parse(gxmpi))

          if (!HLP.compare(this.hashed, hash.toString(CryptoJS.enc.Latin1)))
-            return this.otr.error('Hashed g^x does not match.', true)
+            return this.otr.error('Hashed g^x does not match.')

          // verify gx is legal 2 <= g^x <= N-2
          if (!HLP.checkGroup(this.their_y, N_MINUS_2))
-            return this.otr.error('Illegal g^x.', true)
+            return this.otr.error('Illegal g^x.')

          this.createKeys(this.their_y)

@@ -1321,7 +1332,7 @@
            , this.m1
            , HLP.packCtr(0)
          )
-          if (vsm[0]) return this.otr.error(vsm[0], true)
+          if (vsm[0]) return this.otr.error(vsm[0])

          // store their key
          this.their_keyid = vsm[1]
@@ -1363,7 +1374,7 @@
            , this.m1_prime
            , HLP.packCtr(0)
          )
-          if (vsm[0]) return this.otr.error(vsm[0], true)
+          if (vsm[0]) return this.otr.error(vsm[0])

          // store their key
          this.their_keyid = vsm[1]
@@ -1920,6 +1931,11 @@
  var MAX_INT = Math.pow(2, 53) - 1  // doubles
  var MAX_UINT = Math.pow(2, 31) - 1  // bitwise operators

+  // an internal callback
+  function OTRCB(cb) {
+    this.cb = cb
+  }
+
  // OTR contructor
  function OTR(options) {
    if (!(this instanceof OTR)) return new OTR(options)
@@ -2090,9 +2106,10 @@
      })
    })
    this.sm.on('send', function (ssid, send) {
-      if (self.ssid === ssid)
+      if (self.ssid === ssid) {
        send = self.prepareMsg(send)
        self.io(send)
+      }
    })
  }

@@ -2108,8 +2125,13 @@
    ;(function send(first) {
      if (!first) {
        if (!self.outgoing.length) return
-        var elem = self.outgoing.shift()
+        var elem = self.outgoing.shift(), cb = null
+        if (elem.meta instanceof OTRCB) {
+          cb = elem.meta.cb
+          elem.meta = null
+        }
        self.trigger('io', [elem.msg, elem.meta])
+        if (cb) cb()
      }
      setTimeout(send, first ? 0 : self.send_interval)
    }(true))
@@ -2142,7 +2164,7 @@
    this.sendenc = HLP.mask(HLP.h1(sendbyte, secbytes), 0, 128)  // f16 bytes
    this.sendmac = CryptoJS.SHA1(CryptoJS.enc.Latin1.parse(this.sendenc))
    this.sendmac = this.sendmac.toString(CryptoJS.enc.Latin1)
-    this.sendmacused = false
+
    this.rcvenc = HLP.mask(HLP.h1(rcvbyte, secbytes), 0, 128)
    this.rcvmac = CryptoJS.SHA1(CryptoJS.enc.Latin1.parse(this.rcvenc))
    this.rcvmac = this.rcvmac.toString(CryptoJS.enc.Latin1)
@@ -2161,7 +2183,6 @@
    // reveal old mac keys
    var self = this
    this.sessKeys[1].forEach(function (sk) {
-      if (sk && sk.sendmacused) self.oldMacKeys.push(sk.sendmac)
      if (sk && sk.rcvmacused) self.oldMacKeys.push(sk.rcvmac)
    })

@@ -2189,7 +2210,6 @@
    // reveal old mac keys
    var self = this
    this.sessKeys.forEach(function (sk) {
-      if (sk[1] && sk[1].sendmacused) self.oldMacKeys.push(sk[1].sendmac)
      if (sk[1] && sk[1].rcvmacused) self.oldMacKeys.push(sk[1].rcvmac)
    })

@@ -2207,12 +2227,12 @@

  OTR.prototype.prepareMsg = function (msg, esk) {
    if (this.msgstate !== CONST.MSGSTATE_ENCRYPTED || this.their_keyid === 0)
-      return this.error('Not ready to encrypt.')
+      return this.notify('Not ready to encrypt.')

    var sessKeys = this.sessKeys[1][0]

    if (sessKeys.send_counter >= MAX_INT)
-      return this.error('Should have rekeyed by now.')
+      return this.notify('Should have rekeyed by now.')

    sessKeys.send_counter += 1

@@ -2233,7 +2253,7 @@
    send += ctr.substring(0, 8)

    if (Math.ceil(msg.length / 8) >= MAX_UINT)  // * 16 / 128
-      return this.error('Message is too long.')
+      return this.notify('Message is too long.')

    var aes = HLP.encryptAes(
        CryptoJS.enc.Latin1.parse(msg)
@@ -2245,8 +2265,6 @@
    send += HLP.make1Mac(send, sessKeys.sendmac)
    send += HLP.packData(this.oldMacKeys.splice(0).join(''))

-    sessKeys.sendmacused = true
-
    send = HLP.wrapMsg(
        send
      , this.fragment_size
@@ -2254,7 +2272,7 @@
      , this.our_instance_tag
      , this.their_instance_tag
    )
-    if (send[0]) return this.error(send[0])
+    if (send[0]) return this.notify(send[0])

    // emit extra symmetric key
    if (esk) this.trigger('file', ['send', sessKeys.extra_symkey, esk])
@@ -2275,7 +2293,7 @@
    var ign = (msg[0] === '\x01')

    if (this.msgstate !== CONST.MSGSTATE_ENCRYPTED || msg.length !== 8) {
-      if (!ign) this.error('Received an unreadable encrypted message.', true)
+      if (!ign) this.error('Received an unreadable encrypted message.')
      return
    }

@@ -2283,12 +2301,12 @@
    var their_keyid = this.their_keyid - HLP.readLen(msg[1])

    if (our_keyid < 0 || our_keyid > 1) {
-      if (!ign) this.error('Not of our latest keys.', true)
+      if (!ign) this.error('Not of our latest keys.')
      return
    }

    if (their_keyid < 0 || their_keyid > 1) {
-      if (!ign) this.error('Not of your latest keys.', true)
+      if (!ign) this.error('Not of your latest keys.')
      return
    }

@@ -2383,10 +2401,10 @@

  OTR.prototype.smpSecret = function (secret, question) {
    if (this.msgstate !== CONST.MSGSTATE_ENCRYPTED)
-      return this.error('Must be encrypted for SMP.')
+      return this.notify('Must be encrypted for SMP.')

    if (typeof secret !== 'string' || secret.length < 1)
-      return this.error('Secret is required.')
+      return this.notify('Secret is required.')

    if (!this.sm) this._smInit()

@@ -2443,7 +2461,7 @@
        break
      case CONST.MSGSTATE_FINISHED:
        this.storedMgs.push({msg: msg, meta: meta})
-        this.error('Message cannot be sent at this time.')
+        this.notify('Message cannot be sent at this time.', 'warn')
        return
      case CONST.MSGSTATE_ENCRYPTED:
        msg = this.prepareMsg(msg)
@@ -2464,18 +2482,26 @@

    switch (msg.cls) {
      case 'error':
-        this.error(msg.msg)
+        this.notify(msg.msg)
        return
      case 'ake':
        if ( msg.version === CONST.OTR_VERSION_3 &&
          this.checkInstanceTags(msg.instance_tags)
-        ) return  // ignore
+        ) {
+          this.notify(
+            'Received a message intended for a different session.', 'warn')
+          return  // ignore
+        }
        this.ake.handleAKE(msg)
        return
      case 'data':
        if ( msg.version === CONST.OTR_VERSION_3 &&
          this.checkInstanceTags(msg.instance_tags)
-        ) return  // ignore
+        ) {
+          this.notify(
+            'Received a message intended for a different session.', 'warn')
+          return  // ignore
+        }
        msg.msg = this.handleDataMsg(msg)
        msg.encrypted = true
        break
@@ -2487,7 +2513,7 @@
        // check for encrypted
        if ( this.REQUIRE_ENCRYPTION ||
             this.msgstate !== CONST.MSGSTATE_PLAINTEXT
-        ) this.error('Received an unencrypted message.')
+        ) this.notify('Received an unencrypted message.', 'warn')

        // received a plaintext message
        // stop sending the whitespace tag
@@ -2522,20 +2548,19 @@
    } else if (this.ALLOW_V2 && ~msg.ver.indexOf(CONST.OTR_VERSION_2)) {
      this.ake.initiateAKE(CONST.OTR_VERSION_2)
    } else {
-      // is this an error?
-      this.error('OTR conversation requested, ' +
-        'but no compatible protocol version found.')
+      this.notify('OTR conversation requested, ' +
+        'but no compatible protocol version found.', 'warn')
    }
  }

-  OTR.prototype.error = function (err, send) {
-    if (send) {
-      if (!this.debug) err = "An OTR error has occurred."
-      err = '?OTR Error:' + err
-      this.io(err)
-      return
-    }
-    this.trigger('error', [err])
+  OTR.prototype.error = function (err) {
+    if (!this.debug) err = 'An OTR error has occurred.'
+    this.io('?OTR Error:' + err)
+    this.notify(err)
+  }
+
+  OTR.prototype.notify = function (err, severity) {
+    this.trigger('error', [err, severity || 'error'])
  }

  OTR.prototype.sendStored = function () {
@@ -2548,18 +2573,18 @@

  OTR.prototype.sendFile = function (filename) {
    if (this.msgstate !== CONST.MSGSTATE_ENCRYPTED)
-      return this.error('Not ready to encrypt.')
+      return this.notify('Not ready to encrypt.')

    if (this.ake.otr_version !== CONST.OTR_VERSION_3)
-      return this.error('Protocol v3 required.')
+      return this.notify('Protocol v3 required.')

-    if (!filename) return this.error('Please specify a filename.')
+    if (!filename) return this.notify('Please specify a filename.')

    // utf8 filenames
    var l1name = CryptoJS.enc.Utf8.parse(filename)
    l1name = l1name.toString(CryptoJS.enc.Latin1)

-    if (l1name.length >= 65532) return this.error('filename is too long.')
+    if (l1name.length >= 65532) return this.notify('Filename is too long.')

    var msg = '\x00'  // null byte
    msg += '\x00\x08'  // type 8 tlv
@@ -2571,9 +2596,11 @@
    this.io(msg)
  }

-  OTR.prototype.endOtr = function () {
+  OTR.prototype.endOtr = function (cb) {
    if (this.msgstate === CONST.MSGSTATE_ENCRYPTED) {
-      this.sendMsg('\x00\x00\x01\x00\x00')
+      if (typeof cb === 'function')
+        cb = new OTRCB(cb)
+      this.sendMsg('\x00\x00\x01\x00\x00', cb)
      if (this.sm) {
        if (this.smw) this.sm.worker.terminate()  // destroy webworker
        this.sm = null
@@ -50,6 +50,17 @@
    child.__super__ = parent.prototype
  }

+  // assumes 32-bit
+  function intCompare(x, y) {
+    var z = ~(x ^ y)
+    z &= z >> 16
+    z &= z >> 8
+    z &= z >> 4
+    z &= z >> 2
+    z &= z >> 1
+    return z & 1
+  }
+
  // constant-time string comparison
  HLP.compare = function (str1, str2) {
    if (str1.length !== str2.length)
@@ -57,7 +68,7 @@
    var i = 0, result = 0
    for (; i < str1.length; i++)
      result |= str1[i].charCodeAt(0) ^ str2[i].charCodeAt(0)
-    return result === 0
+    return intCompare(result, 0)
  }

  HLP.randomExponent = function () {
@@ -7,6 +7,8 @@
 * 
 * Authors: - Michael Weibel <michael.weibel@gmail.com> - Klaus Herberth <klaus@jsxc.org>
 * Copyright: - Michael Weibel <michael.weibel@gmail.com>
+ * 
+ * @license MIT
 */

 (function($) {
@@ -7,6 +7,9 @@ TraceablePeerConnection = function(ice_config, constraints) {
    var RTCPeerconnection = navigator.mozGetUserMedia ? mozRTCPeerConnection : webkitRTCPeerConnection;
    this.peerconnection = new RTCPeerconnection(ice_config, constraints);
    this.updateLog = [];
+    this.stats = {};
+    this.statsinterval = null;
+    this.maxstats = 300; // limit to 300 values, i.e. 5 minutes; set to 0 to disable

    // override as desired
    this.trace = function(what, info) {
@@ -14,47 +17,47 @@ TraceablePeerConnection = function(ice_config, constraints) {
        self.updateLog.push({
            time: new Date(),
            type: what,
-            value: info
+            value: info || ""
        });
    };
    this.onicecandidate = null;
    this.peerconnection.onicecandidate = function (event) {
-        self.trace('onicecandidate', event.candidate);
+        self.trace('onicecandidate', JSON.stringify(event.candidate, null, ' '));
        if (self.onicecandidate !== null) {
            self.onicecandidate(event);
        }
    };
    this.onaddstream = null;
    this.peerconnection.onaddstream = function (event) {
-        self.trace('onaddstream', event.stream);
+        self.trace('onaddstream', event.stream.id);
        if (self.onaddstream !== null) {
            self.onaddstream(event);
        }
    };
    this.onremovestream = null;
    this.peerconnection.onremovestream = function (event) {
-        self.trace('onremovestream', event.stream);
+        self.trace('onremovestream', event.stream.id);
        if (self.onremovestream !== null) {
            self.onremovestream(event);
        }
    };
    this.onsignalingstatechange = null;
    this.peerconnection.onsignalingstatechange = function (event) {
-        self.trace('onsignalingstatechange', event);
+        self.trace('onsignalingstatechange', self.signalingState);
        if (self.onsignalingstatechange !== null) {
            self.onsignalingstatechange(event);
        }
    };
    this.oniceconnectionstatechange = null;
    this.peerconnection.oniceconnectionstatechange = function (event) {
-        self.trace('oniceconnectionstatechange', event);
+        self.trace('oniceconnectionstatechange', self.iceConnectionState);
        if (self.oniceconnectionstatechange !== null) {
            self.oniceconnectionstatechange(event);
        }
    };
    this.onnegotiationneeded = null;
    this.peerconnection.onnegotiationneeded = function (event) {
-        self.trace('onnegotiationneeded', event);
+        self.trace('onnegotiationneeded');
        if (self.onnegotiationneeded !== null) {
            self.onnegotiationneeded(event);
        }
@@ -66,20 +69,56 @@ TraceablePeerConnection = function(ice_config, constraints) {
            self.ondatachannel(event);
        }
    }
+    if (!navigator.mozGetUserMedia) {
+        this.statsinterval = window.setInterval(function() {
+            self.peerconnection.getStats(function(stats) {
+                var results = stats.result();
+                for (var i = 0; i < results.length; ++i) {
+                    //console.log(results[i].type, results[i].id, results[i].names())
+                    var now = new Date();
+                    results[i].names().forEach(function (name) {
+                        var id = results[i].id + '-' + name;
+                        if (!self.stats[id]) {
+                            self.stats[id] = {
+                                startTime: now,
+                                endTime: now,
+                                values: [],
+                                times: []
+                            };
+                        }
+                        self.stats[id].values.push(results[i].stat(name));
+                        self.stats[id].times.push(now.getTime());
+                        if (self.stats[id].values.length > self.maxstats) {
+                            self.stats[id].values.shift();
+                            self.stats[id].times.shift();
+                        }
+                        self.stats[id].endTime = now;
+                    });
+                }
+            });
+
+        }, 1000);
+    }
 };

-TraceablePeerConnection.prototype.__defineGetter__('signalingState', function() { return this.peerconnection.signalingState; });
-TraceablePeerConnection.prototype.__defineGetter__('iceConnectionState', function() { return this.peerconnection.iceConnectionState; });
-TraceablePeerConnection.prototype.__defineGetter__('localDescription', function() { return this.peerconnection.localDescription; });
-TraceablePeerConnection.prototype.__defineGetter__('remoteDescription', function() { return this.peerconnection.remoteDescription; });
+dumpSDP = function(description) {
+    return 'type: ' + description.type + '\r\n' + description.sdp;
+}
+
+if (TraceablePeerConnection.prototype.__defineGetter__ !== undefined) {
+    TraceablePeerConnection.prototype.__defineGetter__('signalingState', function() { return this.peerconnection.signalingState; });
+    TraceablePeerConnection.prototype.__defineGetter__('iceConnectionState', function() { return this.peerconnection.iceConnectionState; });
+    TraceablePeerConnection.prototype.__defineGetter__('localDescription', function() { return this.peerconnection.localDescription; });
+    TraceablePeerConnection.prototype.__defineGetter__('remoteDescription', function() { return this.peerconnection.remoteDescription; });
+}

 TraceablePeerConnection.prototype.addStream = function (stream) {
-    this.trace('addStream', stream);
+    this.trace('addStream', stream.id);
    this.peerconnection.addStream(stream);
 };

 TraceablePeerConnection.prototype.removeStream = function (stream) {
-    this.trace('removeStream', stream);
+    this.trace('removeStream', stream.id);
    this.peerconnection.removeStream(stream);
 };

@@ -90,7 +129,7 @@ TraceablePeerConnection.prototype.createDataChannel = function (label, opts) {

 TraceablePeerConnection.prototype.setLocalDescription = function (description, successCallback, failureCallback) {
    var self = this;
-    this.trace('setLocalDescription', description);
+    this.trace('setLocalDescription', dumpSDP(description));
    this.peerconnection.setLocalDescription(description, 
        function () {
            self.trace('setLocalDescriptionOnSuccess');
@@ -101,11 +140,16 @@ TraceablePeerConnection.prototype.setLocalDescription = function (description, s
            failureCallback(err);
        }
    );
+    /*
+    if (this.statsinterval === null && this.maxstats > 0) {
+        // start gathering stats
+    }
+    */
 };

 TraceablePeerConnection.prototype.setRemoteDescription = function (description, successCallback, failureCallback) {
    var self = this;
-    this.trace('setRemoteDescription', description);
+    this.trace('setRemoteDescription', dumpSDP(description));
    this.peerconnection.setRemoteDescription(description, 
        function () {
            self.trace('setRemoteDescriptionOnSuccess');
@@ -116,20 +160,29 @@ TraceablePeerConnection.prototype.setRemoteDescription = function (description,
            failureCallback(err);
        }
    );
+    /*
+    if (this.statsinterval === null && this.maxstats > 0) {
+        // start gathering stats
+    }
+    */
 };

 TraceablePeerConnection.prototype.close = function () {
    this.trace('stop');
+    if (this.statsinterval !== null) {
+        window.clearInterval(this.statsinterval);
+        this.statsinterval = null;
+    }
    this.peerconnection.close();
 };

 TraceablePeerConnection.prototype.createOffer = function (successCallback, failureCallback, constraints) {
    var self = this;
-    this.trace('createOffer', constraints);
+    this.trace('createOffer', JSON.stringify(constraints, null, ' '));
    this.peerconnection.createOffer(
-        function (sdp) {
-            self.trace('createOfferOnSuccess', sdp);
-            successCallback(sdp);
+        function (offer) {
+            self.trace('createOfferOnSuccess', dumpSDP(offer));
+            successCallback(offer);
        },
        function(err) {
            self.trace('createOfferOnFailure', err);
@@ -141,11 +194,11 @@ TraceablePeerConnection.prototype.createOffer = function (successCallback, failu

 TraceablePeerConnection.prototype.createAnswer = function (successCallback, failureCallback, constraints) {
    var self = this;
-    this.trace('createAnswer', constraints);
+    this.trace('createAnswer', JSON.stringify(constraints, null, ' '));
    this.peerconnection.createAnswer(
-        function (sdp) {
-            self.trace('createAnswerOnSuccess', sdp);
-            successCallback(sdp);
+        function (answer) {
+            self.trace('createAnswerOnSuccess', dumpSDP(answer));
+            successCallback(answer);
        },
        function(err) {
            self.trace('createAnswerOnFailure', err);
@@ -157,7 +210,7 @@ TraceablePeerConnection.prototype.createAnswer = function (successCallback, fail

 TraceablePeerConnection.prototype.addIceCandidate = function (candidate, successCallback, failureCallback) {
    var self = this;
-    this.trace('addIceCandidate', candidate);
+    this.trace('addIceCandidate', JSON.stringify(candidate, null, ' '));
    this.peerconnection.addIceCandidate(candidate);
    /* maybe later
    this.peerconnection.addIceCandidate(candidate, 
@@ -173,11 +226,14 @@ TraceablePeerConnection.prototype.addIceCandidate = function (candidate, success
    */
 };

-TraceablePeerConnection.prototype.getStats = function(callback) {
-    this.peerconnection.getStats(callback);
+TraceablePeerConnection.prototype.getStats = function(callback, errback) {
+    if (navigator.mozGetUserMedia) {
+        // ignore for now...
+    } else {
+        this.peerconnection.getStats(callback);
+    }
 };

-
 // mozilla chrome compat layer -- very similar to adapter.js
 setupRTC = function (){
    var RTC = null;
@@ -320,11 +376,11 @@ getUserMediaWithConstraints = function(um, resolution, bandwidth, fps) {
                },
                function (error) {
                    console.warn('Failed to get access to local media. Error ', error);
-                    $(document).trigger('mediafailure.jingle');
+                    $(document).trigger('mediafailure.jingle', [error]);
                });
    } catch (e) {
        console.error('GUM failed: ', e);
        $(document).trigger('mediafailure.jingle');
    }
 }
-}(jQuery));
+}(jQuery));
@@ -91,9 +91,13 @@ Strophe.addConnectionPlugin('jingle', {
            sess.ice_config = this.ice_config;

            sess.initiate($(iq).attr('from'), false);
-            // FIXME: setRemoteDescription should only be done when this call is to be accepted
            sess.setRemoteDescription($(iq).find('>jingle'), 'offer');

+            if ($(iq).find('>jingle>muted[xmlns="http://jitsi.org/protocol/meet#startmuted"]').length) {
+                console.log('got a request to start muted');
+                sess.startmuted = true;
+            }
+
            this.sessions[sess.sid] = sess;
            this.jid2session[sess.peerjid] = sess;

@@ -209,6 +213,7 @@ Strophe.addConnectionPlugin('jingle', {
        // validity have to be fetched before creating the peerconnection
        // TODO: implement refresh via updateIce as described in
        //      https://code.google.com/p/webrtc/issues/detail?id=1650
+        var self = this;
        this.connection.sendIQ(
            $iq({type: 'get', to: this.connection.domain})
                .c('services', {xmlns: 'urn:xmpp:extdisco:1'}).c('service', {host: 'turn.' + this.connection.domain}),
@@ -248,7 +253,7 @@ Strophe.addConnectionPlugin('jingle', {
                        break;
                    }
                });
-                this.ice_config.iceServers = iceservers;
+                self.ice_config.iceServers = iceservers;
            },
            function (err) {
                console.warn('getting turn credentials failed', err);
@@ -75,15 +75,7 @@ SDP.prototype.toJingle = function (elem, thecreator) {
        for (i = 0; i < lines.length; i++) {
            tmp = lines[i].split(' ');
            var semantics = tmp.shift().substr(8);
-            // new plan
-            elem.c('group', {xmlns: 'urn:xmpp:jingle:apps:grouping:0', type: semantics, semantics:semantics});
-            for (j = 0; j < tmp.length; j++) {
-                elem.c('content', {name: tmp[j]}).up();
-            }
-            elem.up();
-
-            // temporary plan, to be removed
-            elem.c('group', {xmlns: 'urn:ietf:rfc:5888', type: semantics});
+            elem.c('group', {xmlns: 'urn:xmpp:jingle:apps:grouping:0', semantics:semantics});
            for (j = 0; j < tmp.length; j++) {
                elem.c('content', {name: tmp[j]}).up();
            }
@@ -620,6 +612,9 @@ SDPUtil = {
            case 'generation':
                candidate.generation = elems[i + 1];
                break;
+            case 'tcptype':
+                candidate.tcptype = elems[i + 1];
+                break;
            default: // TODO
                console.log('parse_icecandidate not translating "' + elems[i] + '" = "' + elems[i + 1] + '"');
            }
@@ -647,6 +642,12 @@ SDPUtil = {
            }
            break;
        }
+        if (cand.hasOwnAttribute('tcptype')) {
+            line += 'tcptype';
+            line += ' ';
+            line += cand.tcptype;
+            line += ' ';
+        }
        line += 'generation';
        line += ' ';
        line += cand.hasOwnAttribute('generation') ? cand.generation : '0';
@@ -729,8 +730,10 @@ SDPUtil = {
    candidateToJingle: function (line) {
        // a=candidate:2979166662 1 udp 2113937151 192.168.2.100 57698 typ host generation 0
        //      <candidate component=... foundation=... generation=... id=... ip=... network=... port=... priority=... protocol=... type=.../>
-        if (line.substring(0, 12) != 'a=candidate:') {
-            console.log('parseCandidate called with a line that is not a candidate line');
+        if (line.indexOf('candidate:') === 0) {
+            line = 'a=' + line;
+        } else if (line.substring(0, 12) != 'a=candidate:') {            
+			console.log('parseCandidate called with a line that is not a candidate line');
            console.log(line);
            return null;
        }
@@ -752,6 +755,9 @@ SDPUtil = {
        candidate.port = elems[5];
        // elems[6] => "typ"
        candidate.type = elems[7];
+
+        candidate.generation = '0'; // fippo from jitsi-meet: default, may be overwritten below
+
        for (i = 8; i < elems.length; i += 2) {
            switch (elems[i]) {
            case 'raddr':
@@ -763,6 +769,9 @@ SDPUtil = {
            case 'generation':
                candidate.generation = elems[i + 1];
                break;
+            case 'tcptype':
+                candidate.tcptype = elems[i + 1];
+                break;
            default: // TODO
                console.log('not translating "' + elems[i] + '" = "' + elems[i + 1] + '"');
            }
@@ -810,4 +819,4 @@ SDPUtil = {
        return line + '\r\n';
    }
 };
-}(jQuery));
+}(jQuery));
@@ -23,7 +23,7 @@ JingleSession = function(me, sid, connection) {
    this.stopTime = null;
    this.media_constraints = null;
    this.pc_constraints = null;
-    this.ice_config = {},
+    this.ice_config = {};
    this.drip_container = [];

    this.usetrickle = true;
@@ -40,8 +40,18 @@ JingleSession = function(me, sid, connection) {

    this.addssrc = [];
    this.removessrc = [];
+    this.pendingop = null;

    this.wait = true;
+
+    // XEP-0172 support, non-standard
+    this.nickname = null;
+
+    // non-standard "please start muted" support for colibri/meet
+    this.startmuted = false;
+
+    // Filter for testcases with ICE Candidates
+    this.filter_candidates = null;
 }

 JingleSession.prototype.initiate = function (peerjid, isInitiator) {
@@ -159,6 +169,7 @@ JingleSession.prototype.accept = function () {
    this.peerconnection.setLocalDescription(new RTCSessionDescription({type: 'answer', sdp: sdp}),
        function () {
            //console.log('setLocalDescription success');
+            $(document).trigger('setLocalDescription.jingle', [self.sid]);
        },
        function (e) {
            console.error('setLocalDescription failed', e);
@@ -197,118 +208,50 @@ JingleSession.prototype.sendIceCandidate = function (candidate) {
            this.hadturncandidate = true;
        }

-        if (this.usetrickle) {
-            if (this.usedrip) {
-                if (this.drip_container.length === 0) {
-                    // start 10ms callout
-                    window.setTimeout(function () {
-                        if (self.drip_container.length === 0) return;
-                        var allcands = self.drip_container;
-                        self.drip_container = [];
-                        var cand = $iq({to: self.peerjid, type: 'set'})
-                            .c('jingle', {xmlns: 'urn:xmpp:jingle:1',
-                               action: 'transport-info',
-                               initiator: self.initiator,
-                               sid: self.sid});
-                        for (var mid = 0; mid < self.localSDP.media.length; mid++) {
-                            var cands = allcands.filter(function (el) { return el.sdpMLineIndex == mid; });
-                            if (cands.length > 0) {
-                                var ice = SDPUtil.iceparams(self.localSDP.media[mid], self.localSDP.session);
-                                ice.xmlns = 'urn:xmpp:jingle:transports:ice-udp:1';
-                                cand.c('content', {creator: self.initiator == self.me ? 'initiator' : 'responder',
-                                       name: cands[0].sdpMid
-                                }).c('transport', ice);
-                                for (var i = 0; i < cands.length; i++) {
-                                    cand.c('candidate', SDPUtil.candidateToJingle(cands[i].candidate)).up();
-                                }
-                                // add fingerprint
-                                if (SDPUtil.find_line(self.localSDP.media[mid], 'a=fingerprint:', self.localSDP.session)) {
-                                    var tmp = SDPUtil.parse_fingerprint(SDPUtil.find_line(self.localSDP.media[mid], 'a=fingerprint:', self.localSDP.session));
-                                    tmp.required = true;
-                                    cand.c('fingerprint').t(tmp.fingerprint);
-                                    delete tmp.fingerprint;
-                                    cand.attrs(tmp);
-                                    cand.up();
-                                }
-                                cand.up(); // transport
-                                cand.up(); // content
-                            }
-                        }
-                        // might merge last-candidate notification into this, but it is called alot later. See webrtc issue #2340
-                        //console.log('was this the last candidate', self.lasticecandidate);
-                        self.connection.sendIQ(cand,
-                            function () {
-                                var ack = {};
-                                ack.source = 'transportinfo';
-                                $(document).trigger('ack.jingle', [self.sid, ack]);
-                            },
-                            function (stanza) {
-                                var error = ($(stanza).find('error').length) ? {
-                                    code: $(stanza).find('error').attr('code'),
-                                    reason: $(stanza).find('error :first')[0].tagName,
-                                }:{};
-                                error.source = 'transportinfo';
-                                $(document).trigger('error.jingle', [self.sid, error]);
-                            },
-                        10000);
-                    }, 10);
+        if(this.filter_candidates === null || jcand.type === this.filter_candidates) {
+            if (this.usetrickle) {
+                console.log('sendIceCandidate using trickle');
+                if (this.usedrip) {
+                    if (this.drip_container.length === 0) {
+                        // start 20ms callout
+                        window.setTimeout(function () {
+                            console.log('sending drip container');
+                            if (self.drip_container.length === 0) return;
+                            self.sendIceCandidates(self.drip_container);
+                            self.drip_container = [];
+                        }, 20);
+
+                    }
+                    this.drip_container.push(event.candidate);
+                    return;
+                } else {
+                    console.log('sending single candidate');
+                    self.sendIceCandidates([event.candidate]);
                }
-                this.drip_container.push(event.candidate);
-                return;
            }
-            // map to transport-info
-            var cand = $iq({to: this.peerjid, type: 'set'})
-                .c('jingle', {xmlns: 'urn:xmpp:jingle:1',
-                        action: 'transport-info',
-                        initiator: this.initiator,
-                        sid: this.sid})
-                .c('content', {creator: this.initiator == this.me ? 'initiator' : 'responder',
-                        name: candidate.sdpMid
-                        })
-                .c('transport', ice)
-                .c('candidate', jcand);
-            cand.up();
-            // add fingerprint
-            if (SDPUtil.find_line(this.localSDP.media[candidate.sdpMLineIndex], 'a=fingerprint:', this.localSDP.session)) {
-                var tmp = SDPUtil.parse_fingerprint(SDPUtil.find_line(this.localSDP.media[candidate.sdpMLineIndex], 'a=fingerprint:', this.localSDP.session));
-                tmp.required = true;
-                cand.c('fingerprint').t(tmp.fingerprint);
-                delete tmp.fingerprint;
-                cand.attrs(tmp);
-                cand.up();
-            }
-            this.connection.sendIQ(cand,
-                function () {
-                    var ack = {};
-                    ack.source = 'transportinfo';
-                    $(document).trigger('ack.jingle', [self.sid, ack]);
-                },
-                function (stanza) {
-                    console.error('transport info error');
-                    var error = ($(stanza).find('error').length) ? {
-                        code: $(stanza).find('error').attr('code'),
-                        reason: $(stanza).find('error :first')[0].tagName,
-                    }:{};
-                    error.source = 'transportinfo';
-                    $(document).trigger('error.jingle', [self.sid, error]);
-                },
-            10000);
        }
    } else {
-        //console.log('sendIceCandidate: last candidate.');
+        console.log('sendIceCandidate: last candidate...');
        if (!this.usetrickle) {
-            //console.log('should send full offer now...');
+            console.log('should send full offer now...');
            var init = $iq({to: this.peerjid,
                       type: 'set'})
                .c('jingle', {xmlns: 'urn:xmpp:jingle:1',
                   action: this.peerconnection.localDescription.type == 'offer' ? 'session-initiate' : 'session-accept',
                   initiator: this.initiator,
                   sid: this.sid});
+            if (this.nickname != null) {
+                init.c('nick', {xmlns:'http://jabber.org/protocol/nick'}).t(this.nickname).up();
+            }
+            if (this.startmuted) {
+                init.c('muted', {xmlns:'http://jitsi.org/protocol/meet#startmuted'}).up();
+            }
            this.localSDP = new SDP(this.peerconnection.localDescription.sdp);
            this.localSDP.toJingle(init, this.initiator == this.me ? 'initiator' : 'responder');
+            console.log('try to send ack(offer)...');
            this.connection.sendIQ(init,
                function () {
-                    //console.log('session initiate ack');
+                    console.log('Sent session initiate (ACK, offer)...');
                    var ack = {};
                    ack.source = 'offer';
                    $(document).trigger('ack.jingle', [self.sid, ack]);
@@ -330,11 +273,65 @@ JingleSession.prototype.sendIceCandidate = function (candidate) {
        console.log('Have we encountered any relay candidates? ' + this.hadturncandidate);

        if (!(this.hadstuncandidate || this.hadturncandidate) && this.peerconnection.signalingState != 'closed') {
+            console.log('no candidates found!');
            $(document).trigger('nostuncandidates.jingle', [this.sid]);
        }
    }
 };

+JingleSession.prototype.sendIceCandidates = function (candidates) {
+    console.log('sendIceCandidates', candidates);
+    var cand = $iq({to: this.peerjid, type: 'set'})
+        .c('jingle', {xmlns: 'urn:xmpp:jingle:1',
+           action: 'transport-info',
+           initiator: this.initiator,
+           sid: this.sid});
+    for (var mid = 0; mid < this.localSDP.media.length; mid++) {
+        var cands = candidates.filter(function (el) { return el.sdpMLineIndex == mid; });
+        if (cands.length > 0) {
+            var ice = SDPUtil.iceparams(this.localSDP.media[mid], this.localSDP.session);
+            ice.xmlns = 'urn:xmpp:jingle:transports:ice-udp:1';
+            cand.c('content', {creator: this.initiator == this.me ? 'initiator' : 'responder',
+                   name: cands[0].sdpMid
+            }).c('transport', ice);
+            for (var i = 0; i < cands.length; i++) {
+                cand.c('candidate', SDPUtil.candidateToJingle(cands[i].candidate)).up();
+            }
+            // add fingerprint
+            if (SDPUtil.find_line(this.localSDP.media[mid], 'a=fingerprint:', this.localSDP.session)) {
+                var tmp = SDPUtil.parse_fingerprint(SDPUtil.find_line(this.localSDP.media[mid], 'a=fingerprint:', this.localSDP.session));
+                tmp.required = true;
+                cand.c('fingerprint').t(tmp.fingerprint);
+                delete tmp.fingerprint;
+                cand.attrs(tmp);
+                cand.up();
+            }
+            cand.up(); // transport
+            cand.up(); // content
+        }
+    }
+    // might merge last-candidate notification into this, but it is called alot later. See webrtc issue #2340
+    //console.log('was this the last candidate', this.lasticecandidate);
+    console.log('try to send ack(transportinfo)...');
+    this.connection.sendIQ(cand,
+        function () {
+            var ack = {};
+            ack.source = 'transportinfo';
+            console.log('Sent session initiate (ACK, transportinfo)...');
+            $(document).trigger('ack.jingle', [this.sid, ack]);
+        },
+        function (stanza) {
+            var error = ($(stanza).find('error').length) ? {
+                code: $(stanza).find('error').attr('code'),
+                reason: $(stanza).find('error :first')[0].tagName,
+            }:{};
+            error.source = 'transportinfo';
+            $(document).trigger('error.jingle', [this.sid, error]);
+        },
+    10000);
+};
+
+
 JingleSession.prototype.sendOffer = function () {
    //console.log('sendOffer...');
    var self = this;
@@ -360,6 +357,12 @@ JingleSession.prototype.createdOffer = function (sdp) {
               action: 'session-initiate',
               initiator: this.initiator,
               sid: this.sid});
+        if (this.nickname != null) {
+            init.c('nick', {xmlns:'http://jabber.org/protocol/nick'}).t(this.nickname).up();
+        }
+        if (this.startmuted) {
+            init.c('muted', {xmlns:'http://jitsi.org/protocol/meet#startmuted'}).up();
+        }
        this.localSDP.toJingle(init, this.initiator == this.me ? 'initiator' : 'responder');
        this.connection.sendIQ(init,
            function () {
@@ -382,6 +385,7 @@ JingleSession.prototype.createdOffer = function (sdp) {
    sdp.sdp = this.localSDP.raw;
    this.peerconnection.setLocalDescription(sdp, 
        function () {
+            $(document).trigger('setLocalDescription.jingle', [self.sid]);
            //console.log('setLocalDescription success');
        },
        function (e) {
@@ -566,11 +570,31 @@ JingleSession.prototype.sendAnswer = function (provisional) {

 JingleSession.prototype.createdAnswer = function (sdp, provisional) {
    //console.log('createAnswer callback');
-    console.log(sdp);
    var self = this;
    this.localSDP = new SDP(sdp.sdp);
    //this.localSDP.mangle();
    this.usepranswer = provisional === true;
+
+    if (this.startmuted) {
+        console.log('we got a request to start muted...');
+        this.connection.jingle.localStream.getAudioTracks().forEach(function (track) {
+            track.enabled = false;
+        });
+        // doing this freezes local video, too (which probably means it should be replaced
+        // by a symbol
+        this.connection.jingle.localStream.getVideoTracks().forEach(function (track) {
+            track.enabled = false;
+        });
+
+        // set video to recvonly
+        this.localSDP.media[1] = this.localSDP.media[1].replace('a=sendrecv', 'a=recvonly');
+        // and remove a=ssrc lines. Weird things happen otherwise
+        SDPUtil.find_lines(this.localSDP.media[1], 'a=ssrc:').forEach(function (line) {
+            self.localSDP.media[1] = self.localSDP.media[1].replace(line + '\r\n', '');
+        });
+        this.localSDP.raw = this.localSDP.session + this.localSDP.media.join('');
+    }
+
    if (this.usetrickle) {
        if (!this.usepranswer) {
            var accept = $iq({to: this.peerjid,
@@ -601,12 +625,13 @@ JingleSession.prototype.createdAnswer = function (sdp, provisional) {
            for (var i = 0; i < this.localSDP.media.length; i++) {
                this.localSDP.media[i] = this.localSDP.media[i].replace('a=sendrecv\r\n', 'a=inactive\r\n');
            }
-            this.localSDP.raw = this.localSDP.session + '\r\n' + this.localSDP.media.join('');
+            this.localSDP.raw = this.localSDP.session + this.localSDP.media.join('');
        }
    }
    sdp.sdp = this.localSDP.raw;
    this.peerconnection.setLocalDescription(sdp,
        function () {
+            $(document).trigger('setLocalDescription.jingle', [self.sid]);
            //console.log('setLocalDescription success');
        },
        function (e) {
@@ -727,8 +752,8 @@ JingleSession.prototype.removeSource = function (elem) {

 JingleSession.prototype.modifySources = function() {
    var self = this;
-    if (!(this.addssrc.length || this.removessrc.length)) return;
    if (this.peerconnection.signalingState == 'closed') return;
+    if (!(this.addssrc.length || this.removessrc.length || this.pendingop !== null)) return;
    if (!(this.peerconnection.signalingState == 'stable' && this.peerconnection.iceConnectionState == 'connected')) {
        console.warn('modifySources not yet', this.peerconnection.signalingState, this.peerconnection.iceConnectionState);
        this.wait = true;
@@ -764,9 +789,28 @@ JingleSession.prototype.modifySources = function() {
        function() {
            self.peerconnection.createAnswer(
                function(modifiedAnswer) {
+                    // change video direction, see https://github.com/jitsi/jitmeet/issues/41
+                    if (self.pendingop !== null) {
+                        var sdp = new SDP(modifiedAnswer.sdp);
+                        if (sdp.media.length > 1) {
+                            switch(self.pendingop) {
+                            case 'mute':
+                                sdp.media[1] = sdp.media[1].replace('a=sendrecv', 'a=recvonly');
+                                break;
+                            case 'unmute':
+                                sdp.media[1] = sdp.media[1].replace('a=recvonly', 'a=sendrecv');
+                                break;
+                            }
+                            sdp.raw = sdp.session + sdp.media.join('');
+                            modifiedAnswer.sdp = sdp.raw;
+                        }
+                        self.pendingop = null;
+                    }
+
                    self.peerconnection.setLocalDescription(modifiedAnswer,
                        function() {
                            //console.log('modified setLocalDescription ok');
+                            $(document).trigger('setLocalDescription.jingle', [self.sid]);
                        },
                        function(error) {
                            console.log('modified setLocalDescription failed');
@@ -784,6 +828,17 @@ JingleSession.prototype.modifySources = function() {
    );
 };

+// SDP-based mute by going recvonly/sendrecv
+// FIXME: should probably black out the screen as well
+JingleSession.prototype.hardMuteVideo = function (muted) {
+    this.pendingop = muted ? 'mute' : 'unmute';
+    this.modifySources();
+
+    this.connection.jingle.localStream.getVideoTracks().forEach(function (track) {
+        track.enabled = !muted;
+    });
+};
+
 JingleSession.prototype.sendMute = function (muted, content) {
    var info = $iq({to: this.peerjid,
             type: 'set'})
@@ -3,9 +3,10 @@
 * Klaus Herberth, 2014
 */

-// This code was written by Tyler Akins and has been placed in the
-// public domain.  It would be nice if you left this header intact.
-// Base64 code from Tyler Akins -- http://rumkin.com
+/*! This code was written by Tyler Akins and has been placed in the
+   public domain.  It would be nice if you left this header intact.
+   Base64 code from Tyler Akins -- http://rumkin.com
+*/

 var Base64 = (function () {
    var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
@@ -84,7 +85,7 @@ var Base64 = (function () {
    return obj;
 })();

-/*
+/*!
 * A JavaScript implementation of the Secure Hash Algorithm, SHA-1, as defined
 * in FIPS PUB 180-1
 * Version 2.1a Copyright Paul Johnston 2000 - 2002.
@@ -261,7 +262,7 @@ function binb2b64(binarray)
  return str;
 }

-/*
+/*!
 * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
 * Digest Algorithm, as defined in RFC 1321.
 * Version 2.1 Copyright (C) Paul Johnston 1999 - 2002.
@@ -469,7 +470,7 @@ var MD5 = (function () {
    return obj;
 })();

-/*
+/*!
    This program is distributed under the terms of the MIT license.
    Please see the LICENSE file for details.

@@ -0,0 +1,11 @@
+Rotary-Phone6.mp3
+===
+Creator: David English
+Source: http://www.beepzoid.com/old-phones/
+License: unknown
+
+Ping1.mp3
+===
+Creator: CameronMusic
+Source: https://soundcloud.com/freefilmandgamemusic/ping-1?in=freefilmandgamemusic/sets/free-notification-sounds-and
+License: cc 3.0, http://creativecommons.org/licenses/by/3.0/
@@ -0,0 +1,72 @@
+[
+  {
+     "file": "build/lib/strophe.js",
+     "license": "multiple",
+     "url": "http://strophe.im/strophejs/"
+  },
+  {
+     "file": "build/lib/strophe.muc.js",
+     "license": "MIT",
+     "url": "https://github.com/strophe/strophejs-plugins"
+  },
+  {
+     "file": "build/lib/strophe.disco.js",
+     "license": "MIT",
+     "url": "https://github.com/strophe/strophejs-plugins"
+  },
+  {
+     "file": "build/lib/strophe.caps.js",
+     "license": "MIT",
+     "url": "https://github.com/strophe/strophejs-plugins"
+  },
+  {
+     "file": "build/lib/strophe.vcard.js",
+     "license": "MIT",
+     "url": "https://github.com/strophe/strophejs-plugins"
+  },
+  {
+     "file": "build/lib/strophe.jingle/strophe.jingle.js",
+     "license": "MIT",
+     "url": "https://github.com/ESTOS/strophe.jingle"
+  },
+  {
+     "file": "build/lib/strophe.jingle/strophe.jingle.session.js",
+     "license": "MIT",
+     "url": "https://github.com/ESTOS/strophe.jingle"
+  },
+  {
+     "file": "build/lib/strophe.jingle/strophe.jingle.sdp.js",
+     "license": "MIT",
+     "url": "https://github.com/ESTOS/strophe.jingle"
+  },
+  {
+     "file": "build/lib/strophe.jingle/strophe.jingle.adapter.js",
+     "license": "MIT",
+     "url": "https://github.com/ESTOS/strophe.jingle"
+  },
+  {
+     "file": "build/lib/otr/build/dep/salsa20.js",
+     "license": "AGPL3",
+     "url": "https://github.com/neoatlantis/node-salsa20"
+  },
+  {
+     "file": "build/lib/otr/build/dep/bigint.js",
+     "license": "public domain",
+     "url": "www.leemon.com"
+  },
+  {
+     "file": "build/lib/otr/build/dep/crypto.js",
+     "license": "code.google.com/p/crypto-js/wiki/license",
+     "url": "code.google.com/p/crypto-js"
+  },
+  {
+     "file": "build/lib/otr/build/dep/eventemitter.js",
+     "license": "MIT",
+     "url": "http://git.io/ee"
+  },
+  {
+     "file": "build/lib/otr/build/otr.js",
+     "license": "MPL v2.0",
+     "url": "https://arlolra.github.io/otr/"
+  }
+ ]
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>JSDoc: Index</title>
+    
+    <script src="scripts/prettify/prettify.js"> </script>
+    <script src="scripts/prettify/lang-css.js"> </script>
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
+    <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
+</head>
+
+<body>
+
+<div id="main">
+    
+    <h1 class="page-title">Index</h1>
+    
+    
+
+
+    
+
+
+    <h3> </h3>
+
+
+
+
+
+
+
+
+
+    
+
+
+
+
+
+
+
+
+
+</div>
+
+<nav>
+    <h2><a href="index.html">Index</a></h2><h3>Namespaces</h3><ul><li><a href="jsxc.html">jsxc</a></li><li><a href="jsxc.gui.html">gui</a></li><li><a href="jsxc.gui.dialog.html">dialog</a></li><li><a href="jsxc.gui.queryActions.html">queryActions</a></li><li><a href="jsxc.gui.roster.html">roster</a></li><li><a href="jsxc.gui.template.html">template</a></li><li><a href="jsxc.gui.window.html">window</a></li><li><a href="jsxc.l10n.html">l10n</a></li><li><a href="jsxc.notification.html">notification</a></li><li><a href="jsxc.options.html">options</a></li><li><a href="jsxc.otr.html">otr</a></li><li><a href="jsxc.storage.html">storage</a></li><li><a href="jsxc.webrtc.html">webrtc</a></li><li><a href="jsxc.xmpp.html">xmpp</a></li></ul>
+</nav>
+
+<br clear="both">
+
+<footer>
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Thu Nov 06 2014 13:24:26 GMT+0100 (CET)
+</footer>
+
+<script> prettyPrint(); </script>
+<script src="scripts/linenumber.js"> </script>
+</body>
+</html>
@@ -0,0 +1,556 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>JSDoc: Namespace: dialog</title>
+    
+    <script src="scripts/prettify/prettify.js"> </script>
+    <script src="scripts/prettify/lang-css.js"> </script>
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
+    <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
+</head>
+
+<body>
+
+<div id="main">
+    
+    <h1 class="page-title">Namespace: dialog</h1>
+    
+    
+
+
+
+<section>
+    
+<header>
+    <h2>
+        <span class="ancestors"><a href="jsxc.html">jsxc</a><a href="jsxc.gui.html">.gui</a>.</span>
+    
+    dialog
+    </h2>
+    
+</header>  
+
+<article>
+    <div class="container-overview">
+    
+    
+    
+        
+            <div class="description">Wrapper for dialog</div>
+        
+        
+        
+<dl class="details">
+    
+        
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="jsxc.lib.js.html">jsxc.lib.js</a>, <a href="jsxc.lib.js.html#line2281">line 2281</a>
+    </li></ul></dd>
+    
+    
+    
+    
+    
+    
+    
+</dl>
+
+        
+        
+    
+    </div>
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+        <h3 class="subsection-title">Methods</h3>
+        
+        <dl>
+            
+<dt>
+    <h4 class="name" id="close"><span class="type-signature">&lt;static> </span>close<span class="signature">()</span><span class="type-signature"></span></h4>
+    
+    
+</dt>
+<dd>
+    
+    
+    <div class="description">
+        Close current dialog.
+    </div>
+    
+
+    
+    
+    
+    
+    
+    
+    
+<dl class="details">
+    
+        
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="jsxc.lib.js.html">jsxc.lib.js</a>, <a href="jsxc.lib.js.html#line2347">line 2347</a>
+    </li></ul></dd>
+    
+    
+    
+    
+    
+    
+    
+</dl>
+
+    
+    
+
+    
+
+    
+    
+    
+    
+    
+    
+    
+</dd>
+
+        
+            
+<dt>
+    <h4 class="name" id="open"><span class="type-signature">&lt;static> </span>open<span class="signature">(data, <span class="optional">o</span>)</span><span class="type-signature"> &rarr; {jQuery}</span></h4>
+    
+    
+</dt>
+<dd>
+    
+    
+    <div class="description">
+        Open a Dialog.
+    </div>
+    
+
+    
+    
+    
+    
+    
+        <h5>Parameters:</h5>
+        
+
+<table class="params">
+    <thead>
+	<tr>
+		
+		<th>Name</th>
+		
+		
+		<th>Type</th>
+		
+		
+		<th>Argument</th>
+		
+		
+		
+		
+		<th class="last">Description</th>
+	</tr>
+	</thead>
+	
+	<tbody>
+	
+	
+        <tr>
+            
+                <td class="name"><code>data</code></td>
+            
+            
+            <td class="type">
+            
+                
+<span class="param-type">String</span>
+
+
+            
+            </td>
+            
+            
+                <td class="attributes">
+                
+                    
+                
+                    
+                
+                </td>
+            
+            
+            
+            
+            <td class="description last">Data of the dialog</td>
+        </tr>
+	
+	
+	
+        <tr>
+            
+                <td class="name"><code>o</code></td>
+            
+            
+            <td class="type">
+            
+                
+<span class="param-type">Object</span>
+
+
+            
+            </td>
+            
+            
+                <td class="attributes">
+                
+                    &lt;optional><br>
+                
+                    
+                
+                    
+                
+                </td>
+            
+            
+            
+            
+            <td class="description last">Options for the dialog
+                <h6>Properties</h6>
+                
+
+<table class="params">
+    <thead>
+	<tr>
+		
+		<th>Name</th>
+		
+		
+		<th>Type</th>
+		
+		
+		<th>Argument</th>
+		
+		
+		
+		
+		<th class="last">Description</th>
+	</tr>
+	</thead>
+	
+	<tbody>
+	
+	
+        <tr>
+            
+                <td class="name"><code>noClose</code></td>
+            
+            
+            <td class="type">
+            
+                
+<span class="param-type">Boolean</span>
+
+
+            
+            </td>
+            
+            
+                <td class="attributes">
+                
+                    &lt;optional><br>
+                
+                    
+                
+                    
+                
+                </td>
+            
+            
+            
+            
+            <td class="description last">If true, hide all default close options</td>
+        </tr>
+	
+	
+	</tbody>
+</table>
+            </td>
+        </tr>
+	
+	
+	</tbody>
+</table>
+    
+    
+    
+<dl class="details">
+    
+        
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="jsxc.lib.js.html">jsxc.lib.js</a>, <a href="jsxc.lib.js.html#line2296">line 2296</a>
+    </li></ul></dd>
+    
+    
+    
+    
+    
+    
+    
+</dl>
+
+    
+    
+
+    
+
+    
+    
+    
+    
+    
+    <h5>Returns:</h5>
+    
+            
+<div class="param-desc">
+    Dialog object
+</div>
+
+
+
+<dl>
+	<dt>
+		Type
+	</dt>
+	<dd>
+		
+<span class="param-type">jQuery</span>
+
+
+	</dd>
+</dl>
+
+        
+    
+    
+</dd>
+
+        
+            
+<dt>
+    <h4 class="name" id="resize"><span class="type-signature">&lt;static> </span>resize<span class="signature">(options)</span><span class="type-signature"></span></h4>
+    
+    
+</dt>
+<dd>
+    
+    
+    <div class="description">
+        Resizes current dialog.
+    </div>
+    
+
+    
+    
+    
+    
+    
+        <h5>Parameters:</h5>
+        
+
+<table class="params">
+    <thead>
+	<tr>
+		
+		<th>Name</th>
+		
+		
+		<th>Type</th>
+		
+		
+		
+		
+		
+		<th class="last">Description</th>
+	</tr>
+	</thead>
+	
+	<tbody>
+	
+	
+        <tr>
+            
+                <td class="name"><code>options</code></td>
+            
+            
+            <td class="type">
+            
+                
+<span class="param-type">Object</span>
+
+
+            
+            </td>
+            
+            
+            
+            
+            
+            <td class="description last">e.g. width and height</td>
+        </tr>
+	
+	
+	</tbody>
+</table>
+    
+    
+    
+<dl class="details">
+    
+        
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="jsxc.lib.js.html">jsxc.lib.js</a>, <a href="jsxc.lib.js.html#line2357">line 2357</a>
+    </li></ul></dd>
+    
+    
+    
+    
+    
+    
+    
+</dl>
+
+    
+    
+
+    
+
+    
+    
+    
+    
+    
+    
+    
+</dd>
+
+        </dl>
+    
+    
+    
+    
+    
+</article>
+
+</section>  
+
+
+
+
+</div>
+
+<nav>
+    <h2><a href="index.html">Index</a></h2><h3>Namespaces</h3><ul><li><a href="jsxc.html">jsxc</a></li><li><a href="jsxc.gui.html">gui</a></li><li><a href="jsxc.gui.dialog.html">dialog</a></li><li><a href="jsxc.gui.queryActions.html">queryActions</a></li><li><a href="jsxc.gui.roster.html">roster</a></li><li><a href="jsxc.gui.template.html">template</a></li><li><a href="jsxc.gui.window.html">window</a></li><li><a href="jsxc.l10n.html">l10n</a></li><li><a href="jsxc.notification.html">notification</a></li><li><a href="jsxc.options.html">options</a></li><li><a href="jsxc.otr.html">otr</a></li><li><a href="jsxc.storage.html">storage</a></li><li><a href="jsxc.webrtc.html">webrtc</a></li><li><a href="jsxc.xmpp.html">xmpp</a></li></ul>
+</nav>
+
+<br clear="both">
+
+<footer>
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Thu Nov 06 2014 13:24:26 GMT+0100 (CET)
+</footer>
+
+<script> prettyPrint(); </script>
+<script src="scripts/linenumber.js"> </script>
+</body>
+</html>
@@ -0,0 +1,404 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>JSDoc: Namespace: queryActions</title>
+    
+    <script src="scripts/prettify/prettify.js"> </script>
+    <script src="scripts/prettify/lang-css.js"> </script>
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
+    <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
+</head>
+
+<body>
+
+<div id="main">
+    
+    <h1 class="page-title">Namespace: queryActions</h1>
+    
+    
+
+
+
+<section>
+    
+<header>
+    <h2>
+        <span class="ancestors"><a href="jsxc.html">jsxc</a><a href="jsxc.gui.html">.gui</a>.</span>
+    
+    queryActions
+    </h2>
+    
+</header>  
+
+<article>
+    <div class="container-overview">
+    
+    
+    
+        
+            <div class="description">Different uri query actions as defined in XEP-0147.</div>
+        
+        
+        
+<dl class="details">
+    
+        
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="jsxc.lib.js.html">jsxc.lib.js</a>, <a href="jsxc.lib.js.html#line820">line 820</a>
+    </li></ul></dd>
+    
+    
+    
+    
+    
+    
+    
+</dl>
+
+        
+        
+    
+    </div>
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+        <h3 class="subsection-title">Methods</h3>
+        
+        <dl>
+            
+<dt>
+    <h4 class="name" id="message"><span class="type-signature">&lt;static> </span>message<span class="signature">()</span><span class="type-signature"></span></h4>
+    
+    
+</dt>
+<dd>
+    
+    
+    <div class="description">
+        xmpp:JID?message[;body=TEXT]
+    </div>
+    
+
+    
+    
+    
+    
+    
+    
+    
+<dl class="details">
+    
+        
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="jsxc.lib.js.html">jsxc.lib.js</a>, <a href="jsxc.lib.js.html#line827">line 827</a>
+    </li></ul></dd>
+    
+    
+    
+    
+    
+    
+    
+</dl>
+
+    
+    
+
+    
+
+    
+    
+    
+    
+    
+    
+    
+</dd>
+
+        
+            
+<dt>
+    <h4 class="name" id="remove"><span class="type-signature">&lt;static> </span>remove<span class="signature">()</span><span class="type-signature"></span></h4>
+    
+    
+</dt>
+<dd>
+    
+    
+    <div class="description">
+        xmpp:JID?remove
+    </div>
+    
+
+    
+    
+    
+    
+    
+    
+    
+<dl class="details">
+    
+        
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="jsxc.lib.js.html">jsxc.lib.js</a>, <a href="jsxc.lib.js.html#line836">line 836</a>
+    </li></ul></dd>
+    
+    
+    
+    
+    
+    
+    
+</dl>
+
+    
+    
+
+    
+
+    
+    
+    
+    
+    
+    
+    
+</dd>
+
+        
+            
+<dt>
+    <h4 class="name" id="subscribe"><span class="type-signature">&lt;static> </span>subscribe<span class="signature">()</span><span class="type-signature"></span></h4>
+    
+    
+</dt>
+<dd>
+    
+    
+    <div class="description">
+        xmpp:JID?subscribe[;name=NAME]
+    </div>
+    
+
+    
+    
+    
+    
+    
+    
+    
+<dl class="details">
+    
+        
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="jsxc.lib.js.html">jsxc.lib.js</a>, <a href="jsxc.lib.js.html#line841">line 841</a>
+    </li></ul></dd>
+    
+    
+    
+    
+    
+    
+    
+</dl>
+
+    
+    
+
+    
+
+    
+    
+    
+    
+    
+    
+    
+</dd>
+
+        
+            
+<dt>
+    <h4 class="name" id="vcard"><span class="type-signature">&lt;static> </span>vcard<span class="signature">()</span><span class="type-signature"></span></h4>
+    
+    
+</dt>
+<dd>
+    
+    
+    <div class="description">
+        xmpp:JID?vcard
+    </div>
+    
+
+    
+    
+    
+    
+    
+    
+    
+<dl class="details">
+    
+        
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="jsxc.lib.js.html">jsxc.lib.js</a>, <a href="jsxc.lib.js.html#line850">line 850</a>
+    </li></ul></dd>
+    
+    
+    
+    
+    
+    
+    
+</dl>
+
+    
+    
+
+    
+
+    
+    
+    
+    
+    
+    
+    
+</dd>
+
+        </dl>
+    
+    
+    
+    
+    
+</article>
+
+</section>  
+
+
+
+
+</div>
+
+<nav>
+    <h2><a href="index.html">Index</a></h2><h3>Namespaces</h3><ul><li><a href="jsxc.html">jsxc</a></li><li><a href="jsxc.gui.html">gui</a></li><li><a href="jsxc.gui.dialog.html">dialog</a></li><li><a href="jsxc.gui.queryActions.html">queryActions</a></li><li><a href="jsxc.gui.roster.html">roster</a></li><li><a href="jsxc.gui.template.html">template</a></li><li><a href="jsxc.gui.window.html">window</a></li><li><a href="jsxc.l10n.html">l10n</a></li><li><a href="jsxc.notification.html">notification</a></li><li><a href="jsxc.options.html">options</a></li><li><a href="jsxc.otr.html">otr</a></li><li><a href="jsxc.storage.html">storage</a></li><li><a href="jsxc.webrtc.html">webrtc</a></li><li><a href="jsxc.xmpp.html">xmpp</a></li></ul>
+</nav>
+
+<br clear="both">
+
+<footer>
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Thu Nov 06 2014 13:24:26 GMT+0100 (CET)
+</footer>
+
+<script> prettyPrint(); </script>
+<script src="scripts/linenumber.js"> </script>
+</body>
+</html>
@@ -0,0 +1,124 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>JSDoc: Namespace: template</title>
+    
+    <script src="scripts/prettify/prettify.js"> </script>
+    <script src="scripts/prettify/lang-css.js"> </script>
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
+    <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
+</head>
+
+<body>
+
+<div id="main">
+    
+    <h1 class="page-title">Namespace: template</h1>
+    
+    
+
+
+
+<section>
+    
+<header>
+    <h2>
+        <span class="ancestors"><a href="jsxc.html">jsxc</a><a href="jsxc.gui.html">.gui</a>.</span>
+    
+    template
+    </h2>
+    
+</header>  
+
+<article>
+    <div class="container-overview">
+    
+    
+    
+        
+            <div class="description">Hold all HTML templates.</div>
+        
+        
+        
+<dl class="details">
+    
+        
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="jsxc.lib.js.html">jsxc.lib.js</a>, <a href="jsxc.lib.js.html#line2883">line 2883</a>
+    </li></ul></dd>
+    
+    
+    
+    
+    
+    
+    
+</dl>
+
+        
+        
+    
+    </div>
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+</article>
+
+</section>  
+
+
+
+
+</div>
+
+<nav>
+    <h2><a href="index.html">Index</a></h2><h3>Namespaces</h3><ul><li><a href="jsxc.html">jsxc</a></li><li><a href="jsxc.gui.html">gui</a></li><li><a href="jsxc.gui.dialog.html">dialog</a></li><li><a href="jsxc.gui.queryActions.html">queryActions</a></li><li><a href="jsxc.gui.roster.html">roster</a></li><li><a href="jsxc.gui.template.html">template</a></li><li><a href="jsxc.gui.window.html">window</a></li><li><a href="jsxc.l10n.html">l10n</a></li><li><a href="jsxc.notification.html">notification</a></li><li><a href="jsxc.options.html">options</a></li><li><a href="jsxc.otr.html">otr</a></li><li><a href="jsxc.storage.html">storage</a></li><li><a href="jsxc.webrtc.html">webrtc</a></li><li><a href="jsxc.xmpp.html">xmpp</a></li></ul>
+</nav>
+
+<br clear="both">
+
+<footer>
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Thu Nov 06 2014 13:24:26 GMT+0100 (CET)
+</footer>
+
+<script> prettyPrint(); </script>
+<script src="scripts/linenumber.js"> </script>
+</body>
+</html>
@@ -0,0 +1,124 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>JSDoc: Namespace: l10n</title>
+    
+    <script src="scripts/prettify/prettify.js"> </script>
+    <script src="scripts/prettify/lang-css.js"> </script>
+    <!--[if lt IE 9]>
+      <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css">
+    <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css">
+</head>
+
+<body>
+
+<div id="main">
+    
+    <h1 class="page-title">Namespace: l10n</h1>
+    
+    
+
+
+
+<section>
+    
+<header>
+    <h2>
+        <span class="ancestors"><a href="jsxc.html">jsxc</a>.</span>
+    
+    l10n
+    </h2>
+    
+</header>  
+
+<article>
+    <div class="container-overview">
+    
+    
+    
+        
+            <div class="description">Contains all available translations</div>
+        
+        
+        
+<dl class="details">
+    
+        
+    
+    
+    
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="jsxc.lib.js.html">jsxc.lib.js</a>, <a href="jsxc.lib.js.html#line5405">line 5405</a>
+    </li></ul></dd>
+    
+    
+    
+    
+    
+    
+    
+</dl>
+
+        
+        
+    
+    </div>
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+</article>
+
+</section>  
+
+
+
+
+</div>
+
+<nav>
+    <h2><a href="index.html">Index</a></h2><h3>Namespaces</h3><ul><li><a href="jsxc.html">jsxc</a></li><li><a href="jsxc.gui.html">gui</a></li><li><a href="jsxc.gui.dialog.html">dialog</a></li><li><a href="jsxc.gui.queryActions.html">queryActions</a></li><li><a href="jsxc.gui.roster.html">roster</a></li><li><a href="jsxc.gui.template.html">template</a></li><li><a href="jsxc.gui.window.html">window</a></li><li><a href="jsxc.l10n.html">l10n</a></li><li><a href="jsxc.notification.html">notification</a></li><li><a href="jsxc.options.html">options</a></li><li><a href="jsxc.otr.html">otr</a></li><li><a href="jsxc.storage.html">storage</a></li><li><a href="jsxc.webrtc.html">webrtc</a></li><li><a href="jsxc.xmpp.html">xmpp</a></li></ul>
+</nav>
+
+<br clear="both">
+
+<footer>
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.2.2</a> on Thu Nov 06 2014 13:24:26 GMT+0100 (CET)
+</footer>
+
+<script> prettyPrint(); </script>
+<script src="scripts/linenumber.js"> </script>
+</body>
+</html>
@@ -0,0 +1,17 @@
+(function() {
+    var counter = 0;
+    var numbered;
+    var source = document.getElementsByClassName('prettyprint source');
+
+    if (source && source[0]) {
+        source = source[0].getElementsByTagName('code')[0];
+
+        numbered = source.innerHTML.split('\n');
+        numbered = numbered.map(function(item) {
+            counter++;
+            return '<span id="line' + counter + '" class="line"></span>' + item;
+        });
+
+        source.innerHTML = numbered.join('\n');
+    }
+})();
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
@@ -0,0 +1,2 @@
+PR.registerLangHandler(PR.createSimpleLexer([["pln",/^[\t\n\f\r ]+/,null," \t\r\n"]],[["str",/^"(?:[^\n\f\r"\\]|\\(?:\r\n?|\n|\f)|\\[\S\s])*"/,null],["str",/^'(?:[^\n\f\r'\\]|\\(?:\r\n?|\n|\f)|\\[\S\s])*'/,null],["lang-css-str",/^url\(([^"')]*)\)/i],["kwd",/^(?:url|rgb|!important|@import|@page|@media|@charset|inherit)(?=[^\w-]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|\\[\da-f]+ ?)(?:[\w-]|\\\\[\da-f]+ ?)*)\s*:/i],["com",/^\/\*[^*]*\*+(?:[^*/][^*]*\*+)*\//],["com",
+/^(?:<\!--|--\>)/],["lit",/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],["lit",/^#[\da-f]{3,6}/i],["pln",/^-?(?:[_a-z]|\\[\da-f]+ ?)(?:[\w-]|\\\\[\da-f]+ ?)*/i],["pun",/^[^\s\w"']+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[["kwd",/^-?(?:[_a-z]|\\[\da-f]+ ?)(?:[\w-]|\\\\[\da-f]+ ?)*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[["str",/^[^"')]+/]]),["css-str"]);
@@ -0,0 +1,28 @@
+var q=null;window.PR_SHOULD_USE_CONTINUATION=!0;
+(function(){function L(a){function m(a){var f=a.charCodeAt(0);if(f!==92)return f;var b=a.charAt(1);return(f=r[b])?f:"0"<=b&&b<="7"?parseInt(a.substring(1),8):b==="u"||b==="x"?parseInt(a.substring(2),16):a.charCodeAt(1)}function e(a){if(a<32)return(a<16?"\\x0":"\\x")+a.toString(16);a=String.fromCharCode(a);if(a==="\\"||a==="-"||a==="["||a==="]")a="\\"+a;return a}function h(a){for(var f=a.substring(1,a.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),a=
+[],b=[],o=f[0]==="^",c=o?1:0,i=f.length;c<i;++c){var j=f[c];if(/\\[bdsw]/i.test(j))a.push(j);else{var j=m(j),d;c+2<i&&"-"===f[c+1]?(d=m(f[c+2]),c+=2):d=j;b.push([j,d]);d<65||j>122||(d<65||j>90||b.push([Math.max(65,j)|32,Math.min(d,90)|32]),d<97||j>122||b.push([Math.max(97,j)&-33,Math.min(d,122)&-33]))}}b.sort(function(a,f){return a[0]-f[0]||f[1]-a[1]});f=[];j=[NaN,NaN];for(c=0;c<b.length;++c)i=b[c],i[0]<=j[1]+1?j[1]=Math.max(j[1],i[1]):f.push(j=i);b=["["];o&&b.push("^");b.push.apply(b,a);for(c=0;c<
+f.length;++c)i=f[c],b.push(e(i[0])),i[1]>i[0]&&(i[1]+1>i[0]&&b.push("-"),b.push(e(i[1])));b.push("]");return b.join("")}function y(a){for(var f=a.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),b=f.length,d=[],c=0,i=0;c<b;++c){var j=f[c];j==="("?++i:"\\"===j.charAt(0)&&(j=+j.substring(1))&&j<=i&&(d[j]=-1)}for(c=1;c<d.length;++c)-1===d[c]&&(d[c]=++t);for(i=c=0;c<b;++c)j=f[c],j==="("?(++i,d[i]===void 0&&(f[c]="(?:")):"\\"===j.charAt(0)&&
+(j=+j.substring(1))&&j<=i&&(f[c]="\\"+d[i]);for(i=c=0;c<b;++c)"^"===f[c]&&"^"!==f[c+1]&&(f[c]="");if(a.ignoreCase&&s)for(c=0;c<b;++c)j=f[c],a=j.charAt(0),j.length>=2&&a==="["?f[c]=h(j):a!=="\\"&&(f[c]=j.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return f.join("")}for(var t=0,s=!1,l=!1,p=0,d=a.length;p<d;++p){var g=a[p];if(g.ignoreCase)l=!0;else if(/[a-z]/i.test(g.source.replace(/\\u[\da-f]{4}|\\x[\da-f]{2}|\\[^UXux]/gi,""))){s=!0;l=!1;break}}for(var r=
+{b:8,t:9,n:10,v:11,f:12,r:13},n=[],p=0,d=a.length;p<d;++p){g=a[p];if(g.global||g.multiline)throw Error(""+g);n.push("(?:"+y(g)+")")}return RegExp(n.join("|"),l?"gi":"g")}function M(a){function m(a){switch(a.nodeType){case 1:if(e.test(a.className))break;for(var g=a.firstChild;g;g=g.nextSibling)m(g);g=a.nodeName;if("BR"===g||"LI"===g)h[s]="\n",t[s<<1]=y++,t[s++<<1|1]=a;break;case 3:case 4:g=a.nodeValue,g.length&&(g=p?g.replace(/\r\n?/g,"\n"):g.replace(/[\t\n\r ]+/g," "),h[s]=g,t[s<<1]=y,y+=g.length,
+t[s++<<1|1]=a)}}var e=/(?:^|\s)nocode(?:\s|$)/,h=[],y=0,t=[],s=0,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=document.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);m(a);return{a:h.join("").replace(/\n$/,""),c:t}}function B(a,m,e,h){m&&(a={a:m,d:a},e(a),h.push.apply(h,a.e))}function x(a,m){function e(a){for(var l=a.d,p=[l,"pln"],d=0,g=a.a.match(y)||[],r={},n=0,z=g.length;n<z;++n){var f=g[n],b=r[f],o=void 0,c;if(typeof b===
+"string")c=!1;else{var i=h[f.charAt(0)];if(i)o=f.match(i[1]),b=i[0];else{for(c=0;c<t;++c)if(i=m[c],o=f.match(i[1])){b=i[0];break}o||(b="pln")}if((c=b.length>=5&&"lang-"===b.substring(0,5))&&!(o&&typeof o[1]==="string"))c=!1,b="src";c||(r[f]=b)}i=d;d+=f.length;if(c){c=o[1];var j=f.indexOf(c),k=j+c.length;o[2]&&(k=f.length-o[2].length,j=k-c.length);b=b.substring(5);B(l+i,f.substring(0,j),e,p);B(l+i+j,c,C(b,c),p);B(l+i+k,f.substring(k),e,p)}else p.push(l+i,b)}a.e=p}var h={},y;(function(){for(var e=a.concat(m),
+l=[],p={},d=0,g=e.length;d<g;++d){var r=e[d],n=r[3];if(n)for(var k=n.length;--k>=0;)h[n.charAt(k)]=r;r=r[1];n=""+r;p.hasOwnProperty(n)||(l.push(r),p[n]=q)}l.push(/[\S\s]/);y=L(l)})();var t=m.length;return e}function u(a){var m=[],e=[];a.tripleQuotedStrings?m.push(["str",/^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/,q,"'\""]):a.multiLineStrings?m.push(["str",/^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/,
+q,"'\"`"]):m.push(["str",/^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,q,"\"'"]);a.verbatimStrings&&e.push(["str",/^@"(?:[^"]|"")*(?:"|$)/,q]);var h=a.hashComments;h&&(a.cStyleComments?(h>1?m.push(["com",/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,q,"#"]):m.push(["com",/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\n\r]*)/,q,"#"]),e.push(["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,q])):m.push(["com",/^#[^\n\r]*/,
+q,"#"]));a.cStyleComments&&(e.push(["com",/^\/\/[^\n\r]*/,q]),e.push(["com",/^\/\*[\S\s]*?(?:\*\/|$)/,q]));a.regexLiterals&&e.push(["lang-regex",/^(?:^^\.?|[!+-]|!=|!==|#|%|%=|&|&&|&&=|&=|\(|\*|\*=|\+=|,|-=|->|\/|\/=|:|::|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|[?@[^]|\^=|\^\^|\^\^=|{|\||\|=|\|\||\|\|=|~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\s*(\/(?=[^*/])(?:[^/[\\]|\\[\S\s]|\[(?:[^\\\]]|\\[\S\s])*(?:]|$))+\/)/]);(h=a.types)&&e.push(["typ",h]);a=(""+a.keywords).replace(/^ | $/g,
+"");a.length&&e.push(["kwd",RegExp("^(?:"+a.replace(/[\s,]+/g,"|")+")\\b"),q]);m.push(["pln",/^\s+/,q," \r\n\t\xa0"]);e.push(["lit",/^@[$_a-z][\w$@]*/i,q],["typ",/^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/,q],["pln",/^[$_a-z][\w$@]*/i,q],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,q,"0123456789"],["pln",/^\\[\S\s]?/,q],["pun",/^.[^\s\w"-$'./@\\`]*/,q]);return x(m,e)}function D(a,m){function e(a){switch(a.nodeType){case 1:if(k.test(a.className))break;if("BR"===a.nodeName)h(a),
+a.parentNode&&a.parentNode.removeChild(a);else for(a=a.firstChild;a;a=a.nextSibling)e(a);break;case 3:case 4:if(p){var b=a.nodeValue,d=b.match(t);if(d){var c=b.substring(0,d.index);a.nodeValue=c;(b=b.substring(d.index+d[0].length))&&a.parentNode.insertBefore(s.createTextNode(b),a.nextSibling);h(a);c||a.parentNode.removeChild(a)}}}}function h(a){function b(a,d){var e=d?a.cloneNode(!1):a,f=a.parentNode;if(f){var f=b(f,1),g=a.nextSibling;f.appendChild(e);for(var h=g;h;h=g)g=h.nextSibling,f.appendChild(h)}return e}
+for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var a=b(a.nextSibling,0),e;(e=a.parentNode)&&e.nodeType===1;)a=e;d.push(a)}var k=/(?:^|\s)nocode(?:\s|$)/,t=/\r\n?|\n/,s=a.ownerDocument,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=s.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);for(l=s.createElement("LI");a.firstChild;)l.appendChild(a.firstChild);for(var d=[l],g=0;g<d.length;++g)e(d[g]);m===(m|0)&&d[0].setAttribute("value",
+m);var r=s.createElement("OL");r.className="linenums";for(var n=Math.max(0,m-1|0)||0,g=0,z=d.length;g<z;++g)l=d[g],l.className="L"+(g+n)%10,l.firstChild||l.appendChild(s.createTextNode("\xa0")),r.appendChild(l);a.appendChild(r)}function k(a,m){for(var e=m.length;--e>=0;){var h=m[e];A.hasOwnProperty(h)?window.console&&console.warn("cannot override language handler %s",h):A[h]=a}}function C(a,m){if(!a||!A.hasOwnProperty(a))a=/^\s*</.test(m)?"default-markup":"default-code";return A[a]}function E(a){var m=
+a.g;try{var e=M(a.h),h=e.a;a.a=h;a.c=e.c;a.d=0;C(m,h)(a);var k=/\bMSIE\b/.test(navigator.userAgent),m=/\n/g,t=a.a,s=t.length,e=0,l=a.c,p=l.length,h=0,d=a.e,g=d.length,a=0;d[g]=s;var r,n;for(n=r=0;n<g;)d[n]!==d[n+2]?(d[r++]=d[n++],d[r++]=d[n++]):n+=2;g=r;for(n=r=0;n<g;){for(var z=d[n],f=d[n+1],b=n+2;b+2<=g&&d[b+1]===f;)b+=2;d[r++]=z;d[r++]=f;n=b}for(d.length=r;h<p;){var o=l[h+2]||s,c=d[a+2]||s,b=Math.min(o,c),i=l[h+1],j;if(i.nodeType!==1&&(j=t.substring(e,b))){k&&(j=j.replace(m,"\r"));i.nodeValue=
+j;var u=i.ownerDocument,v=u.createElement("SPAN");v.className=d[a+1];var x=i.parentNode;x.replaceChild(v,i);v.appendChild(i);e<o&&(l[h+1]=i=u.createTextNode(t.substring(b,o)),x.insertBefore(i,v.nextSibling))}e=b;e>=o&&(h+=2);e>=c&&(a+=2)}}catch(w){"console"in window&&console.log(w&&w.stack?w.stack:w)}}var v=["break,continue,do,else,for,if,return,while"],w=[[v,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"],
+"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],F=[w,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],G=[w,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"],
+H=[G,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"],w=[w,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],I=[v,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"],
+J=[v,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],v=[v,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],K=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/,N=/\S/,O=u({keywords:[F,H,w,"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END"+
+I,J,v],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),A={};k(O,["default-code"]);k(x([],[["pln",/^[^<?]+/],["dec",/^<!\w[^>]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\S\s]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\S\s]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\S\s]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),
+["default-markup","htm","html","mxml","xhtml","xml","xsl"]);k(x([["pln",/^\s+/,q," \t\r\n"],["atv",/^(?:"[^"]*"?|'[^']*'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/],["pun",/^[/<->]+/],["lang-js",/^on\w+\s*=\s*"([^"]+)"/i],["lang-js",/^on\w+\s*=\s*'([^']+)'/i],["lang-js",/^on\w+\s*=\s*([^\s"'>]+)/i],["lang-css",/^style\s*=\s*"([^"]+)"/i],["lang-css",/^style\s*=\s*'([^']+)'/i],["lang-css",
+/^style\s*=\s*([^\s"'>]+)/i]]),["in.tag"]);k(x([],[["atv",/^[\S\s]+/]]),["uq.val"]);k(u({keywords:F,hashComments:!0,cStyleComments:!0,types:K}),["c","cc","cpp","cxx","cyc","m"]);k(u({keywords:"null,true,false"}),["json"]);k(u({keywords:H,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:K}),["cs"]);k(u({keywords:G,cStyleComments:!0}),["java"]);k(u({keywords:v,hashComments:!0,multiLineStrings:!0}),["bsh","csh","sh"]);k(u({keywords:I,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}),
+["cv","py"]);k(u({keywords:"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["perl","pl","pm"]);k(u({keywords:J,hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb"]);k(u({keywords:w,cStyleComments:!0,regexLiterals:!0}),["js"]);k(u({keywords:"all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes",
+hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]);k(x([],[["str",/^[\S\s]+/]]),["regex"]);window.prettyPrintOne=function(a,m,e){var h=document.createElement("PRE");h.innerHTML=a;e&&D(h,e);E({g:m,i:e,h:h});return h.innerHTML};window.prettyPrint=function(a){function m(){for(var e=window.PR_SHOULD_USE_CONTINUATION?l.now()+250:Infinity;p<h.length&&l.now()<e;p++){var n=h[p],k=n.className;if(k.indexOf("prettyprint")>=0){var k=k.match(g),f,b;if(b=
+!k){b=n;for(var o=void 0,c=b.firstChild;c;c=c.nextSibling)var i=c.nodeType,o=i===1?o?b:c:i===3?N.test(c.nodeValue)?b:o:o;b=(f=o===b?void 0:o)&&"CODE"===f.tagName}b&&(k=f.className.match(g));k&&(k=k[1]);b=!1;for(o=n.parentNode;o;o=o.parentNode)if((o.tagName==="pre"||o.tagName==="code"||o.tagName==="xmp")&&o.className&&o.className.indexOf("prettyprint")>=0){b=!0;break}b||((b=(b=n.className.match(/\blinenums\b(?::(\d+))?/))?b[1]&&b[1].length?+b[1]:!0:!1)&&D(n,b),d={g:k,h:n,i:b},E(d))}}p<h.length?setTimeout(m,
+250):a&&a()}for(var e=[document.getElementsByTagName("pre"),document.getElementsByTagName("code"),document.getElementsByTagName("xmp")],h=[],k=0;k<e.length;++k)for(var t=0,s=e[k].length;t<s;++t)h.push(e[k][t]);var e=q,l=Date;l.now||(l={now:function(){return+new Date}});var p=0,d,g=/\blang(?:uage)?-([\w.]+)(?!\S)/;m()};window.PR={createSimpleLexer:x,registerLangHandler:k,sourceDecorator:u,PR_ATTRIB_NAME:"atn",PR_ATTRIB_VALUE:"atv",PR_COMMENT:"com",PR_DECLARATION:"dec",PR_KEYWORD:"kwd",PR_LITERAL:"lit",
+PR_NOCODE:"nocode",PR_PLAIN:"pln",PR_PUNCTUATION:"pun",PR_SOURCE:"src",PR_STRING:"str",PR_TAG:"tag",PR_TYPE:"typ"}})();
@@ -0,0 +1,290 @@
+html
+{
+    overflow: auto;
+    background-color: #fff;
+}
+
+body
+{
+	font: 14px "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans serif;
+	line-height: 130%;
+	color: #000;
+	background-color: #fff;
+}
+
+a {
+    color: #444;
+}
+
+a:visited {
+    color: #444;
+}
+
+a:active {
+    color: #444;
+}
+
+header
+{
+	display: block;
+	padding: 6px 4px;
+}
+
+.class-description {
+    font-style: italic;
+	font-family: Palatino, 'Palatino Linotype', serif;
+	font-size: 130%;
+	line-height: 140%;
+	margin-bottom: 1em;
+	margin-top: 1em;
+}
+
+#main {
+    float: left;
+    width: 100%;
+}
+
+section
+{
+	display: block;
+	
+	background-color: #fff;
+	padding: 12px 24px;
+    border-bottom: 1px solid #ccc;
+    margin-right: 240px;
+}
+
+.variation {
+    display: none;
+}
+
+.optional:after {
+	content: "opt";
+	font-size: 60%;
+	color: #aaa;
+	font-style: italic;
+	font-weight: lighter;
+}
+
+nav
+{
+	display: block;
+	float: left;
+    margin-left: -230px;
+    margin-top: 28px;
+    width: 220px;
+    border-left: 1px solid #ccc;
+    padding-left: 9px;
+}
+
+nav ul {
+    font-family: 'Lucida Grande', 'Lucida Sans Unicode', arial, sans-serif;
+    font-size: 100%;
+    line-height: 17px;
+    padding:0;
+    margin:0;
+    list-style-type:none;
+}
+
+nav h2 a, nav h2 a:visited {
+    color: #A35A00;
+    text-decoration: none;
+}
+
+nav h3 {
+    margin-top: 12px;
+}
+
+nav li {
+    margin-top: 6px;
+}
+
+nav a {
+    color: #5C5954;
+}
+
+nav a:visited {
+    color: #5C5954;
+}
+
+nav a:active {
+    color: #5C5954;
+}
+
+footer {
+    display: block;
+    padding: 6px;
+    margin-top: 12px;
+    font-style: italic;
+    font-size: 90%;
+}
+
+h1
+{
+	font-size: 200%;
+	font-weight: bold;
+	letter-spacing: -0.01em;
+	margin: 6px 0 9px 0;
+}
+
+h2
+{
+	font-size: 170%;
+	font-weight: bold;
+	letter-spacing: -0.01em;
+	margin: 6px 0 3px 0;
+}
+
+h3
+{
+	font-size: 150%;
+	font-weight: bold;
+	letter-spacing: -0.01em;
+	margin-top: 16px;
+	margin: 6px 0 3px 0;
+}
+
+h4
+{
+	font-size: 130%;
+	font-weight: bold;
+	letter-spacing: -0.01em;
+	margin-top: 16px;
+	margin: 18px 0 3px 0;
+	color: #A35A00;
+}
+
+h5, .container-overview .subsection-title
+{
+	font-size: 120%;
+	font-weight: bold;
+	letter-spacing: -0.01em;
+	margin: 8px 0 3px -16px;
+}
+
+h6
+{
+	font-size: 100%;
+	letter-spacing: -0.01em;
+	margin: 6px 0 3px 0;
+	font-style: italic;
+}
+
+.ancestors { color: #999; }
+.ancestors a
+{
+    color: #999 !important;
+    text-decoration: none;
+}
+
+.important
+{
+	font-weight: bold;
+	color: #950B02;
+}
+
+.yes-def {
+    text-indent: -1000px;
+}
+
+.type-signature {
+    color: #aaa;
+}
+
+.name, .signature {
+	font-family: Consolas, "Lucida Console", Monaco, monospace;
+}
+
+.details { margin-top: 14px; border-left: 2px solid #DDD; }
+.details dt { width:100px; float:left; padding-left: 10px;  padding-top: 6px; }
+.details dd { margin-left: 50px; }
+.details ul { margin: 0; }
+.details ul { list-style-type: none; }
+.details li { margin-left: 30px; padding-top: 6px; }
+.details pre.prettyprint { margin: 0 }
+.details .object-value { padding-top: 0; }
+
+.description {
+	margin-bottom: 1em;
+	margin-left: -16px;
+	margin-top: 1em;
+}
+
+.code-caption
+{
+	font-style: italic;
+	font-family: Palatino, 'Palatino Linotype', serif;
+	font-size: 107%;
+	margin: 0;
+}
+
+.prettyprint
+{
+	border: 1px solid #ddd;
+	width: 80%;
+    overflow: auto;
+}
+
+.prettyprint.source {
+    width: inherit;
+}
+
+.prettyprint code
+{
+	font-family: Consolas, 'Lucida Console', Monaco, monospace;
+	font-size: 100%;
+	line-height: 18px;
+	display: block;
+	padding: 4px 12px;
+	margin: 0;
+	background-color: #fff;
+	color: #000;
+	border-left: 3px #ddd solid;
+}
+
+.prettyprint code span.line
+{
+  display: inline-block;
+}
+
+.params, .props
+{
+	border-spacing: 0;
+	border: 0;
+	border-collapse: collapse;
+}
+
+.params .name, .props .name, .name code {
+	color: #A35A00;
+	font-family: Consolas, 'Lucida Console', Monaco, monospace;
+	font-size: 100%;
+}
+
+.params td, .params th, .props td, .props th
+{
+	border: 1px solid #ddd;
+	margin: 0px;
+	text-align: left;
+	vertical-align: top;
+	padding: 4px 6px;
+	display: table-cell;
+}
+
+.params thead tr, .props thead tr
+{
+	background-color: #ddd;
+	font-weight: bold;
+}
+
+.params .params thead tr, .props .props thead tr
+{
+	background-color: #fff;
+	font-weight: bold;
+}
+
+.params th, .props th { border-right: 1px solid #aaa; }
+.params thead .last, .props thead .last { border-right: 1px solid #ddd; }
+
+.disabled {
+    color: #454545;
+}
@@ -0,0 +1,111 @@
+/* JSDoc prettify.js theme */
+
+/* plain text */
+.pln {
+  color: #000000;
+  font-weight: normal;
+  font-style: normal;
+}
+
+/* string content */
+.str {
+  color: #006400;
+  font-weight: normal;
+  font-style: normal;
+}
+
+/* a keyword */
+.kwd {
+  color: #000000;
+  font-weight: bold;
+  font-style: normal;
+}
+
+/* a comment */
+.com {
+  font-weight: normal;
+  font-style: italic;
+}
+
+/* a type name */
+.typ {
+  color: #000000;
+  font-weight: normal;
+  font-style: normal;
+}
+
+/* a literal value */
+.lit {
+  color: #006400;
+  font-weight: normal;
+  font-style: normal;
+}
+
+/* punctuation */
+.pun {
+  color: #000000;
+  font-weight: bold;
+  font-style: normal;
+}
+
+/* lisp open bracket */
+.opn {
+  color: #000000;
+  font-weight: bold;
+  font-style: normal;
+}
+
+/* lisp close bracket */
+.clo {
+  color: #000000;
+  font-weight: bold;
+  font-style: normal;
+}
+
+/* a markup tag name */
+.tag {
+  color: #006400;
+  font-weight: normal;
+  font-style: normal;
+}
+
+/* a markup attribute name */
+.atn {
+  color: #006400;
+  font-weight: normal;
+  font-style: normal;
+}
+
+/* a markup attribute value */
+.atv {
+  color: #006400;
+  font-weight: normal;
+  font-style: normal;
+}
+
+/* a declaration */
+.dec {
+  color: #000000;
+  font-weight: bold;
+  font-style: normal;
+}
+
+/* a variable name */
+.var {
+  color: #000000;
+  font-weight: normal;
+  font-style: normal;
+}
+
+/* a function name */
+.fun {
+  color: #000000;
+  font-weight: bold;
+  font-style: normal;
+}
+
+/* Specify class=linenums on a pre to get line numbering */
+ol.linenums {
+  margin-top: 0;
+  margin-bottom: 0;
+}
@@ -0,0 +1,132 @@
+/* Tomorrow Theme */
+/* Original theme - https://github.com/chriskempson/tomorrow-theme */
+/* Pretty printing styles. Used with prettify.js. */
+/* SPAN elements with the classes below are added by prettyprint. */
+/* plain text */
+.pln {
+  color: #4d4d4c; }
+
+@media screen {
+  /* string content */
+  .str {
+    color: #718c00; }
+
+  /* a keyword */
+  .kwd {
+    color: #8959a8; }
+
+  /* a comment */
+  .com {
+    color: #8e908c; }
+
+  /* a type name */
+  .typ {
+    color: #4271ae; }
+
+  /* a literal value */
+  .lit {
+    color: #f5871f; }
+
+  /* punctuation */
+  .pun {
+    color: #4d4d4c; }
+
+  /* lisp open bracket */
+  .opn {
+    color: #4d4d4c; }
+
+  /* lisp close bracket */
+  .clo {
+    color: #4d4d4c; }
+
+  /* a markup tag name */
+  .tag {
+    color: #c82829; }
+
+  /* a markup attribute name */
+  .atn {
+    color: #f5871f; }
+
+  /* a markup attribute value */
+  .atv {
+    color: #3e999f; }
+
+  /* a declaration */
+  .dec {
+    color: #f5871f; }
+
+  /* a variable name */
+  .var {
+    color: #c82829; }
+
+  /* a function name */
+  .fun {
+    color: #4271ae; } }
+/* Use higher contrast and text-weight for printable form. */
+@media print, projection {
+  .str {
+    color: #060; }
+
+  .kwd {
+    color: #006;
+    font-weight: bold; }
+
+  .com {
+    color: #600;
+    font-style: italic; }
+
+  .typ {
+    color: #404;
+    font-weight: bold; }
+
+  .lit {
+    color: #044; }
+
+  .pun, .opn, .clo {
+    color: #440; }
+
+  .tag {
+    color: #006;
+    font-weight: bold; }
+
+  .atn {
+    color: #404; }
+
+  .atv {
+    color: #060; } }
+/* Style */
+/*
+pre.prettyprint {
+  background: white;
+  font-family: Menlo, Monaco, Consolas, monospace;
+  font-size: 12px;
+  line-height: 1.5;
+  border: 1px solid #ccc;
+  padding: 10px; }
+*/
+
+/* Specify class=linenums on a pre to get line numbering */
+ol.linenums {
+  margin-top: 0;
+  margin-bottom: 0; }
+
+/* IE indents via margin-left */
+li.L0,
+li.L1,
+li.L2,
+li.L3,
+li.L4,
+li.L5,
+li.L6,
+li.L7,
+li.L8,
+li.L9 {
+  /* */ }
+
+/* Alternate shading for lines */
+li.L1,
+li.L3,
+li.L5,
+li.L7,
+li.L9 {
+  /* */ }
@@ -0,0 +1 @@
+{"url":"numb.viagenie.ca","username":"webrtc@live.com","credential":"muazkh","ttl":43200}
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML>
+<html>
+	<head>
+	  <title>JSXC example application</title>
+	  <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	  
+	  <link href="../lib/jquery-ui.min.css" media="all" rel="stylesheet" type="text/css" />
+	  <link href="../lib/jquery.mCustomScrollbar.css" media="all" rel="stylesheet" type="text/css" />
+	  <link href="../lib/jquery.colorbox.css" media="all" rel="stylesheet" type="text/css" />
+	  <link href="../jsxc.css" media="all" rel="stylesheet" type="text/css" />
+	  <link href="../jsxc.webrtc.css" media="all" rel="stylesheet" type="text/css" />
+	  
+	  <style type="text/css">
+	  body, * {font-size: 13px; font-family: "Helvetica Neue",Helvetica,Arial,FreeSans,sans-serif;}
+	  fieldset {float: left;}
+	  </style>
+	  
+	  <script src="../lib/jquery.min.js"></script>
+	  <script src="../lib/jquery.ui.min.js"></script>
+	  <script src="../lib/jquery.colorbox-min.js"></script>
+	  <script src="../lib/jquery.slimscroll.js"></script>
+	  <script src="../lib/jquery.fullscreen.js"></script>
+	  
+	  <!-- Nightly files:
+	  
+	  <script src="../lib/strophe.js"></script>
+	  <script src="../lib/strophe.muc.js"></script>
+	  <script src="../lib/strophe.disco.js"></script>
+	  <script src="../lib/strophe.caps.js"></script>
+	  <script src="../lib/strophe.vcard.js"></script>
+	  <script src="../lib/strophe.jingle/strophe.jingle.js"></script>
+	  <script src="../lib/strophe.jingle/strophe.jingle.session.js"></script>
+	  <script src="../lib/strophe.jingle/strophe.jingle.sdp.js"></script>
+	  <script src="../lib/strophe.jingle/strophe.jingle.adapter.js"></script>
+	  <script src="../lib/otr/build/dep/salsa20.js"></script>
+	  <script src="../lib/otr/build/dep/bigint.js"></script>
+	  <script src="../lib/otr/build/dep/crypto.js"></script>
+	  <script src="../lib/otr/build/dep/eventemitter.js"></script>
+	  <script src="../lib/otr/build/otr.js"></script>
+	  <script src="../jsxc.lib.js"></script>
+	  <script src="../jsxc.lib.webrtc.js"></script> 
+	  -->
+	  
+	  <!-- Build files: -->
+	  <script src="../build/jsxc.dep.js"></script>
+	  <script src="../build/jsxc.js"></script>
+	  
+	  <script src="js/example.js"></script>
+
+	</head>
+	
+	<body>
+	  <form id="form" method="post" action="login.html">
+		  <fieldset>
+		     <legend>Login</legend>
+		     <label for="username">Username:</label><input type="text" id="username" name="username" /><br />
+		     <label for="password">Password:</label><input type="password" id="password" name="password" /><br />
+		     <input type="submit" value="Log in" />
+		  </fieldset>
+	  </form>
+	</body>
+</html>
@@ -0,0 +1,33 @@
+$(function() {
+   jsxc.init({
+      loginForm: {
+         form: '#form',
+         jid: '#username',
+         pass: '#password'
+      },
+      logoutElement: $('#logout'),
+      checkFlash: false,
+      rosterAppend: 'body',
+      root: '/jsxc/',
+      turnCredentialsPath: 'ajax/getturncredentials.json',
+      displayRosterMinimized: function() {
+         return true;
+      },
+      otr: {
+         debug: true,
+         SEND_WHITESPACE_TAG: true,
+         WHITESPACE_START_AKE: true
+      },
+      loadSettings: function(username, password) {
+         return {
+            xmpp: {
+               url: '/http-bind/',
+               domain: 'localhost',
+               resource: 'example',
+               overwrite: true,
+               onlogin: true
+            }
+         };
+      }
+   });
+});
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML>
+<html>
+   <head>
+     <title>JSXC example application</title>
+     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+     
+     <link href="../lib/jquery-ui.min.css" media="all" rel="stylesheet" type="text/css" />
+     <link href="../lib/jquery.mCustomScrollbar.css" media="all" rel="stylesheet" type="text/css" />
+     <link href="../lib/jquery.colorbox.css" media="all" rel="stylesheet" type="text/css" />
+     <link href="../jsxc.css" media="all" rel="stylesheet" type="text/css" />
+     <link href="../jsxc.webrtc.css" media="all" rel="stylesheet" type="text/css" />
+     
+     <style type="text/css">
+     body, * {font-size: 13px; font-family: "Helvetica Neue",Helvetica,Arial,FreeSans,sans-serif;}
+     fieldset {float: left;}
+     </style>
+     
+     <script src="../lib/jquery.min.js"></script>
+     <script src="../lib/jquery.ui.min.js"></script>
+     <script src="../lib/jquery.colorbox-min.js"></script>
+     <script src="../lib/jquery.slimscroll.js"></script>
+     <script src="../lib/jquery.fullscreen.js"></script>
+     <script src="../lib/strophe.js"></script>
+     <script src="../lib/strophe.muc.js"></script>
+     <script src="../lib/strophe.disco.js"></script>
+     <script src="../lib/strophe.caps.js"></script>
+     <script src="../lib/strophe.vcard.js"></script>
+     <script src="../lib/strophe.jingle/strophe.jingle.js"></script>
+     <script src="../lib/strophe.jingle/strophe.jingle.session.js"></script>
+     <script src="../lib/strophe.jingle/strophe.jingle.sdp.js"></script>
+     <script src="../lib/strophe.jingle/strophe.jingle.adapter.js"></script>
+     <script src="../lib/otr/build/dep/salsa20.js"></script>
+     <script src="../lib/otr/build/dep/bigint.js"></script>
+     <script src="../lib/otr/build/dep/crypto.js"></script>
+     <script src="../lib/otr/build/dep/eventemitter.js"></script>
+     <script src="../lib/otr/build/otr.js"></script>
+     <script src="../jsxc.lib.js"></script>
+     <script src="../jsxc.lib.webrtc.js"></script>
+     
+     <script src="js/example.js"></script>
+
+   </head>
+   
+   <body>
+     <h1>You are logged in :-).</h1>
+     
+     <a href="index.html" id="logout">Log out</a>
+   </body>
+</html>
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Layer_1"
+   xml:space="preserve"
+   height="147.22015"
+   viewBox="0 0 192.89149 147.21771"
+   width="192.89587"
+   version="1.1"
+   y="0px"
+   x="0px"
+   enable-background="new 0 0 176.486 181.437"
+   inkscape:version="0.91pre2 r"
+   sodipodi:docname="XMPP_logo.svg"><metadata
+     id="metadata41"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs39" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview37"
+     showgrid="false"
+     fit-margin-top="10"
+     fit-margin-left="10"
+     fit-margin-right="10"
+     fit-margin-bottom="10"
+     inkscape:zoom="1.3007054"
+     inkscape:cx="71.332001"
+     inkscape:cy="72.501142"
+     inkscape:window-x="75"
+     inkscape:window-y="34"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><linearGradient
+     id="SVGID_1_"
+     y2="0.00048828"
+     gradientUnits="userSpaceOnUse"
+     x2="-1807.2"
+     gradientTransform="translate(1925.9953,9.9988343)"
+     y1="125.86"
+     x1="-1807.2"><stop
+       stop-color="#1b3967"
+       offset=".011"
+       id="stop4" /><stop
+       stop-color="#13b5ea"
+       offset=".467"
+       id="stop6" /><stop
+       stop-color="#002b5c"
+       offset=".9945"
+       id="stop8" /></linearGradient><path
+     d="m 146.28531,24.187835 c 0.077,1.313 -1.786,0.968 -1.786,2.293 0,38.551 -44.720002,96.831035 -89.847002,108.190035 l 0,1.182 C 114.60931,130.34287 181.38231,69.052835 182.89231,10.002834 l -36.6,14.189001 z"
+     id="path10"
+     style="fill:url(#SVGID_1_)"
+     inkscape:connector-curvature="0" /><path
+     d="m 130.22531,27.958835 c 0.077,1.313 0.121,2.633 0.121,3.958 0,38.551 -30.700002,90.497035 -75.827002,101.860035 l 0,1.637 c 59.065002,-3.823 105.810002,-63.023035 105.810002,-109.200035 0,-2.375 -0.125,-4.729 -0.371,-7.056 l -29.73,8.796 z"
+     id="path12"
+     inkscape:connector-curvature="0"
+     style="fill:#e96d1f" /><linearGradient
+     id="SVGID_2_"
+     y2="1.279e-13"
+     gradientUnits="userSpaceOnUse"
+     x2="-1073.2"
+     gradientTransform="matrix(-1,0,0,1,-998.20465,9.9988343)"
+     y1="126.85"
+     x1="-1073.2"><stop
+       stop-color="#1b3967"
+       offset=".011"
+       id="stop15" /><stop
+       stop-color="#13b5ea"
+       offset=".467"
+       id="stop17" /><stop
+       stop-color="#002b5c"
+       offset=".9945"
+       id="stop19" /></linearGradient><path
+     d="m 46.594308,24.187835 c -0.077,1.313 1.787,0.968 1.787,2.293 0,38.551 46.558,97.366035 91.688002,108.730035 l 0,1.639 C 80.116308,131.32987 11.509308,69.049835 9.9993079,9.9998343 L 46.598308,24.188835 Z"
+     id="path21"
+     style="fill:url(#SVGID_2_)"
+     inkscape:connector-curvature="0" /><path
+     d="m 64.726308,28.930835 c -0.076,1.313 -0.12,2.63 -0.12,3.957 0,38.551 30.699,90.497035 75.827002,101.860035 l 0,1.639 C 81.389308,133.59687 34.623308,73.362835 34.623308,27.186835 c 0,-2.375 0.128,-4.729 0.371,-7.056 l 29.73,8.798 z"
+     id="path23"
+     inkscape:connector-curvature="0"
+     style="fill:#a0ce67" /><path
+     d="m 34.708308,19.581835 7.617,2.722 c -0.041,0.962 -0.066,2.254 -0.066,3.225 0,41.219 37.271,98.204035 87.272002,107.120035 3.245,1.088 7.538,2.077 10.932,2.931 l 0,1.638 C 75.209308,131.65787 29.363308,65.351835 34.703308,19.577835 Z"
+     id="path25"
+     inkscape:connector-curvature="0"
+     style="fill:#439639" /><path
+     d="m 160.33531,18.758835 -7.833,2.625 c 0.041,0.963 0.191,2.203 0.191,3.173 0,41.219 -37.272,98.205035 -87.274002,107.120035 -3.243,1.089 -7.538,2.077 -10.93,2.932 l 0,1.639 C 122.83331,127.58787 165.66931,64.528835 160.32931,18.757835 Z"
+     id="path27"
+     inkscape:connector-curvature="0"
+     style="fill:#d9541e" /></svg>
@@ -1,97 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="535.00458"
-   height="510.4368"
-   id="svg3896"
   version="1.1"
-   inkscape:version="0.48+devel r"
-   sodipodi:docname="camera_icon_grey.svg">
-  <defs
-     id="defs3898" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="369.28572"
-     inkscape:cy="50.436783"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:window-width="954"
-     inkscape:window-height="711"
-     inkscape:window-x="129"
-     inkscape:window-y="144"
-     inkscape:window-maximized="0" />
+   id="svg2"
+   width="20"
+   height="20">
  <metadata
-     id="metadata3901">
+     id="metadata10">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
+  <defs
+     id="defs8" />
  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
     id="layer1"
-     transform="translate(-5.7142771,-72.362177)">
-    <rect
-       style="fill:#808080;stroke:none;stroke-width:1.6172694;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3904"
-       width="290.51404"
-       height="294.08438"
-       x="86.054779"
-       y="292.97778" />
+     transform="matrix(0.03788594,0,0,0.03788594,-0.41340793,-2.6310716)">
    <path
-       style="fill:#808080;stroke:none"
-       d="m 292.28572,420.35915 229.57599,-101.39986 0,232.54576 -233.04644,-102.93271 z"
       id="path3906"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
       style="fill:#808080;stroke:none"
-       id="path3908"
-       sodipodi:cx="242.85715"
-       sodipodi:cy="315.21933"
-       sodipodi:rx="117.14286"
-       sodipodi:ry="117.14286"
-       d="M 360.00001,315.21933 A 117.14286,117.14286 0 0 1 242.85715,432.36219 117.14286,117.14286 0 0 1 125.71429,315.21933 117.14286,117.14286 0 0 1 242.85715,198.07647 117.14286,117.14286 0 0 1 360.00001,315.21933 Z"
-       transform="matrix(1.1334136,0,0,1.1663886,-136.76164,-155.82534)" />
-    <a
-       id="a3912"
-       style="fill:#808080;stroke:none"
-       transform="matrix(0.86859739,0,0,0.89386794,47.913668,10.526572)">
-      <path
-         sodipodi:type="arc"
-         style="fill:#808080;stroke:none"
-         id="path3910"
-         sodipodi:cx="242.85715"
-         sodipodi:cy="315.21933"
-         sodipodi:rx="117.14286"
-         sodipodi:ry="117.14286"
-         d="M 360.00001,315.21933 A 117.14286,117.14286 0 0 1 242.85715,432.36219 117.14286,117.14286 0 0 1 125.71429,315.21933 117.14286,117.14286 0 0 1 242.85715,198.07647 117.14286,117.14286 0 0 1 360.00001,315.21933 Z"
-         transform="matrix(1.304878,0,0,1.304878,3.67247,-186.10345)" />
-    </a>
+       d="m 361.65148,313.51768 177.16074,-131.78516 0,302.22999 L 358.97338,350.18517 Z M 10.911922,182.40634 l 378.372678,0 0,302.65582 -378.372678,0 z" />
  </g>
 </svg>
@@ -13,8 +13,8 @@
   height="510.4368"
   id="svg3896"
   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="camera_icon.svg">
+   inkscape:version="0.48+devel r"
+   sodipodi:docname="camera_icon_white.svg">
  <defs
     id="defs3898" />
  <sodipodi:namedview
@@ -24,9 +24,9 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="369.28572"
-     inkscape:cy="50.436783"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="353.91934"
+     inkscape:cy="233.8456"
     inkscape:document-units="px"
     inkscape:current-layer="layer1"
     showgrid="false"
@@ -34,11 +34,11 @@
     fit-margin-left="0"
     fit-margin-right="0"
     fit-margin-bottom="0"
-     inkscape:window-width="954"
-     inkscape:window-height="711"
-     inkscape:window-x="833"
-     inkscape:window-y="106"
-     inkscape:window-maximized="0" />
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
  <metadata
     id="metadata3901">
    <rdf:RDF>
@@ -57,41 +57,16 @@
     id="layer1"
     transform="translate(-5.7142771,-72.362177)">
    <rect
-       style="fill:#ffffff;stroke:#ffffff;stroke-width:1.61726940000000008;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#ffffff;stroke:none;stroke-width:1.6172694;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       id="rect3904"
-       width="290.51404"
-       height="294.08438"
-       x="86.054779"
-       y="292.97778" />
+       width="378.37268"
+       height="302.65582"
+       x="10.911922"
+       y="182.40634" />
    <path
       style="fill:#ffffff;stroke:none"
-       d="m 292.28572,420.35915 229.57599,-101.39986 0,232.54576 -233.04644,-102.93271 z"
+       d="m 361.65148,313.51768 177.16074,-131.78516 0,302.22999 -179.83884,-133.77734 z"
       id="path3906"
       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ffffff;stroke:none"
-       id="path3908"
-       sodipodi:cx="242.85715"
-       sodipodi:cy="315.21933"
-       sodipodi:rx="117.14286"
-       sodipodi:ry="117.14286"
-       d="m 360.00001,315.21933 a 117.14286,117.14286 0 1 1 -234.28572,0 117.14286,117.14286 0 1 1 234.28572,0 z"
-       transform="matrix(1.1334136,0,0,1.1663886,-136.76164,-155.82534)" />
-    <a
-       id="a3912"
-       style="fill:#ffffff"
-       transform="matrix(0.86859739,0,0,0.89386794,47.913668,10.526572)">
-      <path
-         sodipodi:type="arc"
-         style="fill:#ffffff;stroke:none"
-         id="path3910"
-         sodipodi:cx="242.85715"
-         sodipodi:cy="315.21933"
-         sodipodi:rx="117.14286"
-         sodipodi:ry="117.14286"
-         d="m 360.00001,315.21933 c 0,64.69622 -52.44665,117.14286 -117.14286,117.14286 -64.69622,0 -117.14286,-52.44664 -117.14286,-117.14286 0,-64.69622 52.44664,-117.14286 117.14286,-117.14286 64.69621,0 117.14286,52.44664 117.14286,117.14286 z"
-         transform="matrix(1.304878,0,0,1.304878,3.67247,-186.10345)" />
-    </a>
  </g>
 </svg>
@@ -14,7 +14,7 @@
   inkscape:version="0.48+devel r"
   width="15"
   height="15"
-   sodipodi:docname="padlock_open-white.svg">
+   sodipodi:docname="padlock_close_green.svg">
  <metadata
     id="metadata3047">
    <rdf:RDF>
@@ -42,25 +42,45 @@
     inkscape:window-height="1056"
     id="namedview3043"
     showgrid="false"
-     inkscape:zoom="44.500587"
-     inkscape:cx="6.292871"
-     inkscape:cy="6.4926565"
+     inkscape:zoom="32"
+     inkscape:cx="12.823367"
+     inkscape:cy="8.9449238"
     inkscape:window-x="65"
     inkscape:window-y="24"
     inkscape:window-maximized="1"
     inkscape:current-layer="svg3041"
     borderlayer="true" />
  <rect
-     style="fill:#009800;stroke:#009800;stroke-width:0.92522794"
+     style="fill:#44aa00;stroke:#44aa00;stroke-width:0.92522794"
     id="rect3051"
     width="10.232394"
     height="6.4687548"
     x="2.5534275"
     y="8.074255" />
  <path
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:currentColor;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#009800;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.90384686;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     d="M 7.5078125,2.6797098 C 5.0260054,2.6797098 3.491603,3.472493 2.75,4.621116 2.008397,5.7697391 2.0878906,7.0238438 2.0878906,7.699241 l 1.9042969,0 c 0,-0.7329344 0.013699,-1.5125503 0.3574219,-2.0449218 0.3437231,-0.5323715 1.0433343,-1.0703125 3.1582031,-1.0703125 2.0264219,0 2.9669635,0.6265545 3.4326915,1.3827484 0.465728,0.7561939 0.400333,1.7142789 0.400333,1.7142789 0.04517,1.7732263 -0.06599,4.303173 0.0049,5.535784 l 0.05274,0.898438 0.898437,0 0.945445,-0.0031 0.01,-6.4361369 c 0,0 0.06201,-1.6621328 -0.685321,-2.8754827 C 11.819768,3.587152 10.078064,2.6797098 7.5078125,2.6797098 Z"
-     id="path3848"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ssccssscccccccs" />
+     style="fill:none;fill-opacity:1;stroke:#44aa00;stroke-width:2.08827519;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4101"
+     sodipodi:type="arc"
+     sodipodi:cx="7.6713805"
+     sodipodi:cy="6.7928491"
+     sodipodi:rx="4.534133"
+     sodipodi:ry="4.5301714"
+     sodipodi:start="3.1415927"
+     sodipodi:end="0"
+     d="M 3.1372476,6.7928489 A 4.534133,4.5301714 0 0 1 7.6713806,2.2626777 4.534133,4.5301714 0 0 1 12.205513,6.7928491"
+     sodipodi:open="true" />
+  <rect
+     style="fill:#44aa00;fill-opacity:1;stroke:none;stroke-width:1.39526081;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect4153"
+     width="2.0906768"
+     height="1.0984892"
+     x="2.0913804"
+     y="6.7554431" />
+  <rect
+     y="6.7632556"
+     x="11.157786"
+     height="1.0984892"
+     width="2.0906768"
+     id="rect4155"
+     style="fill:#44aa00;fill-opacity:1;stroke:none;stroke-width:1.39526081;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
@@ -14,7 +14,7 @@
   inkscape:version="0.48+devel r"
   width="15"
   height="15"
-   sodipodi:docname="padlock_open-white.svg">
+   sodipodi:docname="padlock_close_grey.svg">
  <metadata
     id="metadata3047">
    <rdf:RDF>
@@ -42,9 +42,9 @@
     inkscape:window-height="1056"
     id="namedview3043"
     showgrid="false"
-     inkscape:zoom="44.500587"
-     inkscape:cx="6.292871"
-     inkscape:cy="6.4926565"
+     inkscape:zoom="32"
+     inkscape:cx="12.792117"
+     inkscape:cy="8.9449238"
     inkscape:window-x="65"
     inkscape:window-y="24"
     inkscape:window-maximized="1"
@@ -57,10 +57,38 @@
     height="6.4687548"
     x="2.5534275"
     y="8.074255" />
-  <path
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:currentColor;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.90384686;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     d="M 7.5078125,2.6797098 C 5.0260054,2.6797098 3.491603,3.472493 2.75,4.621116 2.008397,5.7697391 2.0878906,7.0238438 2.0878906,7.699241 l 1.9042969,0 c 0,-0.7329344 0.013699,-1.5125503 0.3574219,-2.0449218 0.3437231,-0.5323715 1.0433343,-1.0703125 3.1582031,-1.0703125 2.0264219,0 2.9669635,0.6265545 3.4326915,1.3827484 0.465728,0.7561939 0.400333,1.7142789 0.400333,1.7142789 0.04517,1.7732263 -0.06599,4.303173 0.0049,5.535784 l 0.05274,0.898438 0.898437,0 0.945445,-0.0031 0.01,-6.4361369 c 0,0 0.06201,-1.6621328 -0.685321,-2.8754827 C 11.819768,3.587152 10.078064,2.6797098 7.5078125,2.6797098 Z"
-     id="path3848"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ssccssscccccccs" />
+  <a
+     id="a4157"
+     style="fill:none;stroke:#808080">
+    <path
+       sodipodi:open="true"
+       d="M 3.1372476,6.7928489 A 4.534133,4.5301714 0 0 1 7.6713806,2.2626777 4.534133,4.5301714 0 0 1 12.205513,6.7928491"
+       sodipodi:end="0"
+       sodipodi:start="3.1415927"
+       sodipodi:ry="4.5301714"
+       sodipodi:rx="4.534133"
+       sodipodi:cy="6.7928491"
+       sodipodi:cx="7.6713805"
+       sodipodi:type="arc"
+       id="path4101"
+       style="fill:none;fill-opacity:1;stroke:#808080;stroke-width:2.08827519;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </a>
+  <g
+     id="g4170"
+     style="fill:#808080">
+    <rect
+       y="6.7554431"
+       x="2.0913804"
+       height="1.0984892"
+       width="2.0906768"
+       id="rect4153"
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:1.39526081;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:1.39526081;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4155"
+       width="2.0906768"
+       height="1.0984892"
+       x="11.157786"
+       y="6.7632556" />
+  </g>
 </svg>
@@ -14,7 +14,7 @@
   inkscape:version="0.48+devel r"
   width="15"
   height="15"
-   sodipodi:docname="padlock_open-white.svg">
+   sodipodi:docname="padlock_close_orange.svg">
  <metadata
     id="metadata3047">
    <rdf:RDF>
@@ -42,25 +42,53 @@
     inkscape:window-height="1056"
     id="namedview3043"
     showgrid="false"
-     inkscape:zoom="44.500587"
-     inkscape:cx="6.292871"
-     inkscape:cy="6.4926565"
+     inkscape:zoom="32"
+     inkscape:cx="12.792117"
+     inkscape:cy="8.9449238"
     inkscape:window-x="65"
     inkscape:window-y="24"
     inkscape:window-maximized="1"
     inkscape:current-layer="svg3041"
     borderlayer="true" />
  <rect
-     style="fill:#ff9955;stroke:#ff9955;stroke-width:0.92522794"
+     style="fill:#ff7f2a;stroke:#ff7f2a;stroke-width:0.92522794"
     id="rect3051"
     width="10.232394"
     height="6.4687548"
     x="2.5534275"
     y="8.074255" />
-  <path
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-color:currentColor;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;color-interpolation:sRGB;color-interpolation-filters:linearRGB;fill:#ff9955;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.90384686;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     d="M 7.5078125,2.6797098 C 5.0260054,2.6797098 3.491603,3.472493 2.75,4.621116 2.008397,5.7697391 2.0878906,7.0238438 2.0878906,7.699241 l 1.9042969,0 c 0,-0.7329344 0.013699,-1.5125503 0.3574219,-2.0449218 0.3437231,-0.5323715 1.0433343,-1.0703125 3.1582031,-1.0703125 2.0264219,0 2.9669635,0.6265545 3.4326915,1.3827484 0.465728,0.7561939 0.400333,1.7142789 0.400333,1.7142789 0.04517,1.7732263 -0.06599,4.303173 0.0049,5.535784 l 0.05274,0.898438 0.898437,0 0.945445,-0.0031 0.01,-6.4361369 c 0,0 0.06201,-1.6621328 -0.685321,-2.8754827 C 11.819768,3.587152 10.078064,2.6797098 7.5078125,2.6797098 Z"
-     id="path3848"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ssccssscccccccs" />
+  <a
+     id="a4157"
+     style="fill:none;stroke:#ff7f2a">
+    <path
+       sodipodi:open="true"
+       d="M 3.1372476,6.7928489 A 4.534133,4.5301714 0 0 1 7.6713806,2.2626777 4.534133,4.5301714 0 0 1 12.205513,6.7928491"
+       sodipodi:end="0"
+       sodipodi:start="3.1415927"
+       sodipodi:ry="4.5301714"
+       sodipodi:rx="4.534133"
+       sodipodi:cy="6.7928491"
+       sodipodi:cx="7.6713805"
+       sodipodi:type="arc"
+       id="path4101"
+       style="fill:none;fill-opacity:1;stroke:#ff7f2a;stroke-width:2.08827519;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </a>
+  <g
+     id="g4170"
+     style="fill:#ff7f2a">
+    <rect
+       y="6.7554431"
+       x="2.0913804"
+       height="1.0984892"
+       width="2.0906768"
+       id="rect4153"
+       style="fill:#ff7f2a;fill-opacity:1;stroke:none;stroke-width:1.39526081;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       style="fill:#ff7f2a;fill-opacity:1;stroke:none;stroke-width:1.39526081;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4155"
+       width="2.0906768"
+       height="1.0984892"
+       x="11.157786"
+       y="6.7632556" />
+  </g>
 </svg>
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25"
+   height="25"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48+devel r"
+   viewBox="0 0 25 25.000001"
+   sodipodi:docname="speech_balloon_white.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="25.186628"
+     inkscape:cy="14.479999"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1855"
+     inkscape:window-height="1056"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-228.24219,-320.66798)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 240.77627,324.02578 a 12.489309,7.9254426 0 0 0 -12.48944,7.92538 12.489309,7.9254426 0 0 0 5.26146,6.45637 c -0.17862,1.91196 -1.06119,3.95363 -3.14604,4.64437 2.54121,-0.11444 5.60026,-1.93057 7.47209,-3.40137 a 12.489309,7.9254426 0 0 0 2.90193,0.22616 12.489309,7.9254426 0 0 0 12.48928,-7.92553 12.489309,7.9254426 0 0 0 -12.48928,-7.92538 z"
+       id="path4101"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
@@ -1,9 +1,9 @@
-/* jsxc, Strophe, SDPUtil, getUserMediaWithConstraints, setupRTC, jQuery */
+/* global jsxc, Strophe, SDPUtil, getUserMediaWithConstraints, setupRTC, jQuery, MediaStreamTrack */

 var RTC = null, RTCPeerconnection = null;

 jsxc.gui.template.incomingCall = '<h3>%%Incoming_call%%</h3>\
-        <p>%%Do_you_want_to_accept_the_call_from%% {{cid_name}}?</p>\
+        <p>%%Do_you_want_to_accept_the_call_from%% {{bid_name}}?</p>\
        <p class="jsxc_right">\
            <a href="#" class="button jsxc_reject">%%Reject%%</a> <a href="#" class="button creation jsxc_accept">%%Accept%%</a>\
         </p>';
@@ -11,10 +11,28 @@ jsxc.gui.template.incomingCall = '<h3>%%Incoming_call%%</h3>\
 jsxc.gui.template.allowMediaAccess = '<p>%%Please_allow_access_to_microphone_and_camera%%</p>';

 jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
+            <div class="jsxc_chatarea">\
+                <ul></ul>\
+            </div>\
            <div class="jsxc_videoContainer">\
                <video class="jsxc_localvideo" autoplay></video>\
                <video class="jsxc_remotevideo" autoplay></video>\
                <div class="jsxc_status"></div>\
+               <div class="bubblingG">\
+                  <span id="bubblingG_1">\
+                  </span>\
+                  <span id="bubblingG_2">\
+                  </span>\
+                  <span id="bubblingG_3">\
+                  </span>\
+               </div>\
+                <div class="jsxc_noRemoteVideo">\
+                   <div>\
+                     <div></div>\
+                     <p>%%No_video_signal%%</p>\
+                     <div></div>\
+                   </div>\
+                </div>\
            </div>\
            <div class="jsxc_controlbar">\
                <button type="button" class="jsxc_hangUp">%%hang_up%%</button>\
@@ -32,9 +50,9 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
               <div class="jsxc_snapshotbar">\
                   <p>No pictures yet!</p>\
               </div>\n\
-               <div class="jsxc_chatarea">\
+               <!--<div class="jsxc_chatarea">\
                   <ul></ul>\
-               </div>\
+               </div>-->\
               <div class="jsxc_infobar"></div>\
            </div>\
        </div>';
@@ -64,7 +82,7 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
      AUTO_ACCEPT: false,

      /** required disco features */
-      reqVideoFeatures: [ 'urn:xmpp:jingle:apps:rtp:video', 'urn:xmpp:jingle:apps:rtp:audio', 'urn:xmpp:jingle:transports:ice-udp:1' ],
+      reqVideoFeatures: [ 'urn:xmpp:jingle:apps:rtp:video', 'urn:xmpp:jingle:apps:rtp:audio', 'urn:xmpp:jingle:transports:ice-udp:1', 'urn:xmpp:jingle:apps:dtls:0' ],

      /** bare jid to current jid mapping */
      chatJids: {},
@@ -98,6 +116,7 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
         self.conn.jingle.pc_constraints = RTC.pc_constraints;

         $(document).on('message.jsxc', $.proxy(self.onMessage, self));
+         $(document).on('presence.jsxc', $.proxy(self.onPresence, self));

         $(document).on('mediaready.jingle', $.proxy(self.onMediaReady, self));
         $(document).on('mediafailure.jingle', $.proxy(self.onMediaFailure, self));
@@ -114,6 +133,10 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
            jsxc.error('[JINGLE]', error);
         });

+         if (self.conn.disco) {
+            self.conn.disco.addFeature('urn:xmpp:jingle:apps:dtls:0');
+         }
+
         if (self.conn.caps) {
            $(document).on('caps.strophe', $.proxy(self.onCaps, self));
         }
@@ -160,6 +183,62 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
         });
      },

+      /**
+       * Return list of video capable resources.
+       * 
+       * @memberOf jsxc.webrtc
+       * @param jid
+       * @returns {Array}
+       */
+      getCapableRes: function(jid) {
+         var self = jsxc.webrtc;
+         var bid = jsxc.jidToBid(jid);
+         var res = jsxc.storage.getUserItem('res', bid) || [];
+
+         var available = [];
+         $.each(res, function(r) {
+            if (self.conn.caps.hasFeatureByJid(bid + '/' + r, self.reqVideoFeatures)) {
+               available.push(r);
+            }
+         });
+
+         return available;
+      },
+
+      /**
+       * Add "video" button to roster
+       * 
+       * @private
+       * @memberOf jsxc.webrtc
+       * @param event
+       * @param bid bid of roster item
+       * @param data data wich belongs to bid
+       * @param el the roster item
+       */
+      onAddRosterItem: function(event, bid, data, el) {
+         var self = jsxc.webrtc;
+
+         if (!self.conn) {
+            $(document).one('connectionReady.jsxc', function() {
+               self.onAddRosterItem(null, bid, data, el);
+            });
+            return;
+         }
+
+         var videoIcon = $('<div class="jsxc_video jsxc_disabled" title="' + jsxc.l.Start_video_call + '"></div>');
+
+         videoIcon.click(function() {
+            self.startCall(data.jid);
+            return false;
+         });
+
+         el.find('.jsxc_options.jsxc_left').append(videoIcon);
+
+         el.on('extra.jsxc', function() {
+            self.updateIcon(bid);
+         });
+      },
+
      /**
       * Add "video" button to window menu.
       * 
@@ -171,6 +250,8 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
      initWindow: function(event, win) {
         var self = jsxc.webrtc;

+         jsxc.debug('webrtc.initWindow');
+
         if (!self.conn) {
            $(document).one('connectionReady.jsxc', function() {
               self.initWindow(null, win);
@@ -181,47 +262,50 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
         var div = $('<div>').addClass('jsxc_video');
         win.find('.jsxc_transfer:eq(1)').after(div);

-         self.updateWindow(win);
+         self.updateIcon(jsxc.jidToBid(win.data('jid')));
      },

      /**
-       * Enable or disable "video" button and assign full jid.
+       * Enable or disable "video" icon and assign full jid.
       * 
       * @memberOf jsxc.webrtc
-       * @param win jQuery window object
+       * @param bid CSS conform jid
       */
-      updateWindow: function(win) {
-         if (!win || win.length === 0) {
-            return;
-         }
+      updateIcon: function(bid) {
+         jsxc.debug('Update icon', bid);

         var self = jsxc.webrtc;
-         var jid = win.data('jid');
-         var li = win.find('.jsxc_video');
+         var win = jsxc.gui.window.get(bid);
+         var jid = win.data('jid') || jsxc.storage.getUserItem('buddy', bid).jid;

-         // only start video call to a full jid
-         if (Strophe.getResourceFromJid(jid) === null) {
-            var cid = jsxc.jidToCid(jid);
-            var res = jsxc.storage.getUserItem('buddy_' + cid).res;
+         var el = win.find('.jsxc_video').add(jsxc.gui.roster.getItem(bid).find('.jsxc_video'));

-            if (Array.isArray(res) && res.length === 1) {
-               jid += '/' + res[0];
-            }
+         var capableRes = self.getCapableRes(jid);
+         var targetRes = Strophe.getResourceFromJid(jid);
+
+         if (targetRes === null) {
+            $.each(jsxc.storage.getUserItem('buddy', bid).res, function(index, val) {
+               if (capableRes.indexOf(val) > -1) {
+                  targetRes = val;
+                  return false;
+               }
+            });
         }

-         li.off('click');
+         el.off('click');

-         if (self.conn.caps.hasFeatureByJid(jid, self.reqVideoFeatures)) {
-            li.click(function() {
-               self.startCall(jid);
+         if (capableRes.indexOf(targetRes) > -1) {
+            el.click(function() {
+               self.startCall(jid + '/' + targetRes);
            });
-            li.removeClass('jsxc_disabled');

-            li.attr('title', jsxc.translate('%%Start video call%%'));
+            el.removeClass('jsxc_disabled');
+
+            el.attr('title', jsxc.translate('%%Start video call%%'));
         } else {
-            li.addClass('jsxc_disabled');
+            el.addClass('jsxc_disabled');

-            li.attr('title', jsxc.translate('%%Video call not possible.%%'));
+            el.attr('title', jsxc.translate('%%Video call not possible.%%'));
         }
      },

@@ -235,14 +319,32 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
       */
      onMessage: function(e, from) {
         var self = jsxc.webrtc;
-         var bJid = Strophe.getBareJidFromJid(from);
+         var bid = jsxc.jidToBid(from);

-         if (self.chatJids[bJid] !== from) {
-            self.updateWindow(jsxc.gui.getWindow(jsxc.jidToCid(bJid)));
-            self.chatJids[bJid] = from;
+         jsxc.debug('webrtc.onmessage', from);
+
+         if (self.chatJids[bid] !== from) {
+            self.updateIcon(bid);
+            self.chatJids[bid] = from;
         }
      },

+      /**
+       * Update icon on presence.
+       * 
+       * @memberOf jsxc.webrtc
+       * @param ev
+       * @param status
+       * @private
+       */
+      onPresence: function(ev, jid) {
+         var self = jsxc.webrtc;
+
+         jsxc.debug('webrtc.onpresence', jid);
+
+         self.updateIcon(jsxc.jidToBid(jid));
+      },
+
      /**
       * Display status message to user.
       * 
@@ -300,11 +402,8 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
       */
      onCaps: function(event, jid) {
         var self = jsxc.webrtc;
-         var win = jsxc.gui.getWindow(jsxc.jidToCid(jid));

-         if (win.length > 0) {
-            self.updateWindow(win);
-         }
+         self.updateIcon(jsxc.jidToBid(jid));
      },

      /**
@@ -335,6 +434,7 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
            self.setStatus((stream.getVideoTracks().length > 0) ? 'Use local video device.' : 'No local video device.');

            jsxc.debug('using video device "' + stream.getVideoTracks()[i].label + '"');
+            $('#jsxc_dialog .jsxc_localvideo').show();
         }

         $(document).one('cleanup.dialog.jsxc', $.proxy(self.hangUp, self));
@@ -347,8 +447,11 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
       * @private
       * @memberOf jsxc.webrtc
       */
-      onMediaFailure: function() {
+      onMediaFailure: function(ev, err) {
         this.setStatus('media failure');
+
+         jsxc.gui.window.postMessage(jsxc.jidToBid(jsxc.webrtc.last_caller), 'sys', jsxc.translate('%%Media failure%%: ') + err.name);
+         jsxc.debug('media failure: ' + err.name);
      },

      /**
@@ -364,10 +467,12 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\

         var self = this;
         var sess = this.conn.jingle.sessions[sid];
-         var jid = jsxc.jidToCid(sess.peerjid);
+         var bid = jsxc.jidToBid(sess.peerjid);
+
+         jsxc.gui.window.postMessage(bid, 'sys', jsxc.translate('%%Incoming call.%%'));

         // display notification
-         jsxc.notification.notify(jsxc.translate('%%Incoming call%%'), jsxc.translate('%%from%% ' + jid));
+         jsxc.notification.notify(jsxc.translate('%%Incoming call%%'), jsxc.translate('%%from%% ' + bid));

         // send signal to partner
         sess.sendRinging();
@@ -395,7 +500,9 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
            return;
         }

-         var dialog = jsxc.gui.dialog.open(jsxc.gui.template.get('incomingCall', jsxc.jidToCid(jid)));
+         var dialog = jsxc.gui.dialog.open(jsxc.gui.template.get('incomingCall', bid), {
+            noClose: true
+         });

         dialog.find('.jsxc_accept').click(function() {
            $(document).trigger('accept.call.jsxc');
@@ -425,22 +532,30 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
      onCallTerminated: function(event, sid, reason, text) {
         this.setStatus('call terminated ' + sid + (reason ? (': ' + reason + ' ' + text) : ''));

+         var bid = jsxc.jidToBid(jsxc.webrtc.last_caller);
+
         if (this.localStream) {
            this.localStream.stop();
         }

-         $('.jsxc_remotevideo')[0].src = "";
-         $('.jsxc_localvideo')[0].src = "";
+         if ($('.jsxc_videoContainer').length) {
+            $('.jsxc_remotevideo')[0].src = "";
+            $('.jsxc_localvideo')[0].src = "";
+         }

         this.conn.jingle.localStream = null;
         this.localStream = null;
         this.remoteStream = null;

-         $('#jsxc_windowList > ul').prepend($('#jsxc_dialog .jsxc_chatarea > ul > li').detach());
+         var win = $('#jsxc_dialog .jsxc_chatarea > ul > li');
+         $('#jsxc_windowList > ul').prepend(win.detach());
+         win.find('.slimScrollDiv').resizable('enable');

         $(document).off('cleanup.dialog.jsxc');
         $(document).off('error.jingle');
         jsxc.gui.dialog.close();
+
+         jsxc.gui.window.postMessage(bid, 'sys', jsxc.translate('%%Call terminated%%' + (reason ? (': %%' + reason + '%%') : '') + '.'));
      },

      /**
@@ -482,7 +597,9 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
         this.setStatus(isAudioDevice ? 'Use remote audio device.' : 'No remote audio device');

         if ($('.jsxc_remotevideo').length) {
-            RTC.attachMediaStream($('.jsxc_remotevideo'), stream);
+            RTC.attachMediaStream($('#jsxc_dialog .jsxc_remotevideo'), stream);
+
+            $('#jsxc_dialog .jsxc_' + (isVideoDevice ? 'remotevideo' : 'noRemoteVideo')).addClass('jsxc_deviceAvailable');
         }
      },

@@ -516,7 +633,11 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
         jsxc.debug('iceCon state for ' + sid, iceCon);
         jsxc.debug('sig state for ' + sid, sigState);

-         if (sigState === 'stable' && iceCon === 'connected') {
+         if (sigState === 'stable' && (iceCon === 'connected' || iceCon === 'completed')) {
+
+            $('#jsxc_dialog .jsxc_deviceAvailable').show();
+            $('#jsxc_dialog .bubblingG').hide();
+
            var localSDP = sess.peerconnection.localDescription.sdp;
            var remoteSDP = sess.peerconnection.remoteDescription.sdp;

@@ -545,6 +666,15 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
            text += '</p>';

            $('#jsxc_dialog .jsxc_infobar').html(text);
+         } else if (iceCon === 'failed') {
+            jsxc.gui.window.postMessage(jsxc.jidToBid(sess.peerjid), 'sys', jsxc.translate('%%ICE connection failure%%.'));
+
+            $(document).off('cleanup.dialog.jsxc');
+
+            sess.sendTerminate('failed-transport');
+            sess.terminate();
+
+            $(document).trigger('callterminated.jingle');
         }
      },

@@ -563,8 +693,9 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
       * 
       * @memberOf jsxc.webrtc
       * @param jid full jid
+       * @param um requested user media
       */
-      startCall: function(jid) {
+      startCall: function(jid, um) {
         var self = this;

         if (Strophe.getResourceFromJid(jid) === null) {
@@ -578,6 +709,8 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
            'finish.mediaready.jsxc': function() {
               self.setStatus('Initiate call');

+               jsxc.gui.window.postMessage(jsxc.jidToBid(jid), 'sys', jsxc.translate('%%Call started.%%'));
+
               $(document).one('error.jingle', function(e, sid, error) {
                  if (error.source !== 'offer') {
                     return;
@@ -596,7 +729,7 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
            }
         });

-         this.reqUserMedia();
+         self.reqUserMedia(um);
      },

      /**
@@ -604,10 +737,10 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
       * 
       * @memberOf jsxc.webrtc
       */
-      hangUp: function() {
+      hangUp: function(reason, text) {
         $(document).off('cleanup.dialog.jsxc');

-         jsxc.webrtc.conn.jingle.terminate(null);
+         jsxc.webrtc.conn.jingle.terminate(null, reason, text);
         $(document).trigger('callterminated.jingle');
      },

@@ -616,24 +749,41 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
       * 
       * @memberOf jsxc.webrtc
       */
-      reqUserMedia: function() {
+      reqUserMedia: function(um) {
         if (this.localStream) {
            $(document).trigger('mediaready.jingle', [ this.localStream ]);
            return;
         }

+         um = um || [ 'video', 'audio' ];
+
         jsxc.gui.dialog.open(jsxc.gui.template.get('allowMediaAccess'), {
            noClose: true
         });
         this.setStatus('please allow access to microphone and camera');

-         getUserMediaWithConstraints([ 'video', 'audio' ]);
+         if (typeof MediaStreamTrack !== 'undefined' && typeof MediaStreamTrack.getSources !== 'undefined') {
+            MediaStreamTrack.getSources(function(sourceInfo) {
+               var availableDevices = sourceInfo.map(function(el) {
+
+                  return el.kind;
+               });
+
+               um = um.filter(function(el) {
+                  return availableDevices.indexOf(el) !== -1;
+               });
+
+               getUserMediaWithConstraints(um);
+            });
+         } else {
+            getUserMediaWithConstraints(um);
+         }
      },

      /**
       * Make a snapshot from a video stream and display it.
       * 
-       * @memberOf
+       * @memberOf jsxc.webrtc
       * @param video Video stream
       */
      snapshot: function(video) {
@@ -651,7 +801,15 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\

         ctx.drawImage(video[0], 0, 0);
         var img = $('<img/>');
-         var url = canvas.toDataURL('image/jpeg');
+         var url = null;
+
+         try {
+            url = canvas.toDataURL('image/jpeg');
+         } catch (err) {
+            jsxc.warn('Error', err);
+            return;
+         }
+
         img[0].src = url;
         var link = $('<a/>').attr({
            target: '_blank',
@@ -709,6 +867,8 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\

         if (self.remoteStream) {
            RTC.attachMediaStream(rv, self.remoteStream);
+
+            $('#jsxc_dialog .jsxc_' + (self.remoteStream.getVideoTracks().length > 0 ? 'remotevideo' : 'noRemoteVideo')).addClass('jsxc_deviceAvailable');
         }

         var toggleMulti = function(elem, open) {
@@ -725,7 +885,13 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
            }
         };

-         var win = jsxc.gui.window.open(jsxc.jidToCid(jid));
+         var win = jsxc.gui.window.open(jsxc.jidToBid(jid));
+
+         win.find('.slimScrollDiv').resizable('disable');
+         win.find('.jsxc_textarea').slimScroll({
+            height: 413
+         });
+         win.find('.jsxc_emoticons').css('top', (413 + 6) + 'px');

         $('#jsxc_dialog .jsxc_chatarea ul').append(win.detach());

@@ -743,7 +909,21 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
         });

         $('#jsxc_dialog .jsxc_showchat').click(function() {
-            toggleMulti($('#jsxc_dialog .jsxc_chatarea'));
+            var chatarea = $('#jsxc_dialog .jsxc_chatarea');
+
+            if (chatarea.is(':hidden')) {
+               chatarea.show();
+               $('#jsxc_dialog .jsxc_webrtc').width('900');
+               jsxc.gui.dialog.resize({
+                  width: '920px'
+               });
+            } else {
+               chatarea.hide();
+               $('#jsxc_dialog .jsxc_webrtc').width('650');
+               jsxc.gui.dialog.resize({
+                  width: '660px'
+               });
+            }
         });

         $('#jsxc_dialog .jsxc_info').click(function() {
@@ -787,13 +967,14 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
      if (RTC !== null) {
         RTCPeerconnection = RTC.peerconnection;

+         $(document).on('add.roster.jsxc', jsxc.webrtc.onAddRosterItem);
         $(document).on('init.window.jsxc', jsxc.webrtc.initWindow);
         $(document).on('attached.jsxc', jsxc.webrtc.init);
      }
   });

   $.extend(jsxc.l10n.en, {
-      Please_allow_access_to_microphone_and_camera: 'Please allow access to microphone and camera.',
+      Please_allow_access_to_microphone_and_camera: 'Please click the "Allow" button at the top, to allow access to microphone and camera.',
      Incoming_call: 'Incoming call',
      from: 'from',
      Do_you_want_to_accept_the_call_from: 'Do you want to accept the call from',
@@ -809,12 +990,12 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
      Remote_IP: 'Remote IP',
      Local_Fingerprint: 'Local fingerprint',
      Remote_Fingerprint: 'Remote fingerprint',
-      Video_call_not_possible: 'Video call not possible',
+      Video_call_not_possible: 'Video call not possible. Your buddy does not support video calls.',
      Start_video_call: 'Start video call'
   });

   $.extend(jsxc.l10n.de, {
-      Please_allow_access_to_microphone_and_camera: 'Bitte erlaube den Zugriff auf Kamera und Mikrofon.',
+      Please_allow_access_to_microphone_and_camera: 'Bitte klick auf den "Zulassen" Button oben, um den Zugriff auf Kamera und Mikrofon zu erlauben.',
      Incoming_call: 'Eingehender Anruf',
      from: 'von',
      Do_you_want_to_accept_the_call_from: 'Möchtest Du den Anruf annehmen von',
@@ -830,7 +1011,28 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
      Remote_IP: 'Remote IP',
      Local_Fingerprint: 'Lokaler Fingerprint',
      Remote_Fingerprint: 'Remote Fingerprint',
-      Video_call_not_possible: 'Videoanruf nicht verfügbar',
+      Video_call_not_possible: 'Videoanruf nicht verfügbar. Dein Gesprächspartner unterstützt keine Videotelefonie.',
      Start_video_call: 'Starte Videoanruf'
   });
+
+   $.extend(jsxc.l10n.es, {
+      Please_allow_access_to_microphone_and_camera: 'Por favor, permitir el acceso al micrófono y la cámara.',
+      Incoming_call: 'Llamada entrante',
+      from: 'de',
+      Do_you_want_to_accept_the_call_from: 'Desea aceptar la llamada de',
+      Reject: 'Rechazar',
+      Accept: 'Aceptar',
+      hang_up: 'colgar',
+      snapshot: 'instantánea',
+      mute_my_audio: 'silenciar mi audio',
+      pause_my_video: 'pausar mi vídeo',
+      fullscreen: 'pantalla completa',
+      Info: 'Info',
+      Local_IP: 'IP local',
+      Remote_IP: 'IP remota',
+      Local_Fingerprint: 'Firma digital local',
+      Remote_Fingerprint: 'Firma digital remota',
+      Video_call_not_possible: 'Llamada de vídeo no es posible',
+      Start_video_call: 'Iniciar llamada de vídeo'
+   });
 }(jQuery));
@@ -1,17 +1,34 @@
+.jsxc_webrtc {
+	width: 900px;
+}
+
+.jsxc_webrtc li .jsxc_name {
+	cursor: auto;
+}
+
+.jsxc_webrtc li .jsxc_name:hover {
+	color: #939393;
+}
+
 .jsxc_videoContainer {
 	width: 640px;
 	height: 480px;
 	position: relative;
+	background-color: #a4a4a4;
 }

-.jsxc_remotevideo {
+.jsxc_videoContainer video, .jsxc_videoContainer .jsxc_noRemoteVideo {
+	display: none;
+}
+
+.jsxc_remotevideo, .jsxc_noRemoteVideo {
 	width: 100%;
 	height: 100%;
 	position: absolute;
 	top: 0px;
 	left: 0px;
 	z-index: 9000;
-	background-color: grey;
+	background-color: #a4a4a4;
 }

 .jsxc_localvideo {
@@ -25,6 +42,49 @@
 	cursor: pointer;
 }

+.jsxc_noRemoteVideo p {
+	position: absolute;
+	bottom: 0px;
+	left:0px;
+	text-align: center;
+	color: #fff;
+	width: 100%;
+	z-index: 100;
+}
+
+.jsxc_noRemoteVideo > div {
+	width: 200px;
+	height: 200px;
+	overflow: hidden;
+	position: absolute;
+	top: 50%;
+	margin-top: -100px;
+	left: 50%;
+	margin-left: -100px;
+}
+
+.jsxc_noRemoteVideo > div > div {
+	background-color: #717171;
+}
+
+.jsxc_noRemoteVideo > div > div:first-child {
+	width: 50%;
+	height: 50%;
+	border-radius: 50%;
+	position: absolute;
+	left: 50%;
+	margin-left: -25%;
+	top: 10%;
+}
+
+.jsxc_noRemoteVideo > div > div:last-child {
+   position: absolute;
+	bottom: -50%;
+	width: 100%;
+	height: 100%;
+	border-radius: 50%;
+}
+
 .jsxc_webrtc .jsxc_status {
 	z-index: 9999;
 	border-radius: 20px;
@@ -40,6 +100,10 @@
 	text-align: center;
 }

+.jsxc_webrtc .slimScrollDiv {
+	opacity: 1 !important;
+}
+
 div:-moz-full-screen {
 	width: 100%;
 	height: 100%;
@@ -84,6 +148,14 @@ div:fullscreen.jsxc_localvideo {
 	border: 1px solid white;
 }

+.jsxc_controlbar {
+	width: 640px;
+}
+
+.jsxc_controlbar .jsxc_showchat {
+	float: right;
+}
+
 .jsxc_multi>div {
 	display: none;
 }
@@ -115,32 +187,33 @@ div:fullscreen.jsxc_localvideo {

 .jsxc_chatarea {
 	position: relative;
-	height: 255px;
-	display: none;
+	float:right;
+	height: 480px;
+	width: 250px;
 	background-color: #A4A4A4;
 }

-.jsxc_chatarea ul {
-	position: absolute;
-	left: 50%;
-	top: 0px;
-	width: 200px;
-	height: 255px;
+.jsxc_chatarea > ul {
+	width: 250px;
+	height: 480px;
 	list-style: none;
 	padding: 0px;
-	margin: 0px 0px 0px -100px;
 }

 .jsxc_chatarea .jsxc_settings {
-	display: none;
+	display: none !important;
 }

 .jsxc_chatarea .jsxc_close {
-	display: none;
+	display: none !important;
+}
+
+.jsxc_chatarea .jsxc_video {
+   display: none !important;
 }

 .jsxc_chatarea .jsxc_bar {
-	display: none;
+
 }

 .jsxc_chatarea .jsxc_window {
@@ -153,18 +226,154 @@ div:fullscreen.jsxc_localvideo {
 }

 div.jsxc_video {
-   padding: 3px;
-   width: 17px;
-   height: 17px;
   background-image: url('img/camera_icon_grey.svg');
   background-repeat: no-repeat;
   background-position: center center;
   background-size: 15px 15px;
-   cursor: pointer;
-   float: left;
 }

-div.jsxc_video.jsxc_disabled {
-	opacity: 0.5;
-	cursor: default;
-}
+div.jsxc_video:not(.jsxc_disabled):hover, #jsxc_buddylist .jsxc_options .jsxc_video {
+    background-image: url('img/camera_icon_white.svg');
+}
+
+#jsxc_buddylist .jsxc_options .jsxc_video.jsxc_disabled {
+	opacity: 0.2;
+}
+
+.bubblingG {
+text-align: center;
+width:129px;
+height:80px;
+position: absolute;
+top: 40%;
+left: 50%;
+margin-left: -64px;
+}
+
+.bubblingG span {
+display: inline-block;
+vertical-align: middle;
+width: 16px;
+height: 16px;
+margin: 40px auto;
+background: #000000;
+-moz-border-radius: 81px;
+-moz-animation: bubblingG 1.3s infinite alternate;
+-webkit-border-radius: 81px;
+-webkit-animation: bubblingG 1.3s infinite alternate;
+-ms-border-radius: 81px;
+-ms-animation: bubblingG 1.3s infinite alternate;
+-o-border-radius: 81px;
+-o-animation: bubblingG 1.3s infinite alternate;
+border-radius: 81px;
+animation: bubblingG 1.3s infinite alternate;
+}
+
+#bubblingG_1 {
+-moz-animation-delay: 0s;
+-webkit-animation-delay: 0s;
+-ms-animation-delay: 0s;
+-o-animation-delay: 0s;
+animation-delay: 0s;
+}
+
+#bubblingG_2 {
+-moz-animation-delay: 0.39s;
+-webkit-animation-delay: 0.39s;
+-ms-animation-delay: 0.39s;
+-o-animation-delay: 0.39s;
+animation-delay: 0.39s;
+}
+
+#bubblingG_3 {
+-moz-animation-delay: 0.78s;
+-webkit-animation-delay: 0.78s;
+-ms-animation-delay: 0.78s;
+-o-animation-delay: 0.78s;
+animation-delay: 0.78s;
+}
+
+@-moz-keyframes bubblingG {
+0% {
+width: 16px;
+height: 16px;
+background-color:#000000;
+-moz-transform: translateY(0);
+}
+
+100% {
+width: 39px;
+height: 39px;
+background-color:#FFFFFF;
+-moz-transform: translateY(-34px);
+}
+
+}
+
+@-webkit-keyframes bubblingG {
+0% {
+width: 16px;
+height: 16px;
+background-color:#000000;
+-webkit-transform: translateY(0);
+}
+
+100% {
+width: 39px;
+height: 39px;
+background-color:#FFFFFF;
+-webkit-transform: translateY(-34px);
+}
+
+}
+
+@-ms-keyframes bubblingG {
+0% {
+width: 16px;
+height: 16px;
+background-color:#000000;
+-ms-transform: translateY(0);
+}
+
+100% {
+width: 39px;
+height: 39px;
+background-color:#FFFFFF;
+-ms-transform: translateY(-34px);
+}
+
+}
+
+@-o-keyframes bubblingG {
+0% {
+width: 16px;
+height: 16px;
+background-color:#000000;
+-o-transform: translateY(0);
+}
+
+100% {
+width: 39px;
+height: 39px;
+background-color:#FFFFFF;
+-o-transform: translateY(-34px);
+}
+
+}
+
+@keyframes bubblingG {
+0% {
+width: 16px;
+height: 16px;
+background-color:#000000;
+transform: translateY(0);
+}
+
+100% {
+width: 39px;
+height: 39px;
+background-color:#FFFFFF;
+transform: translateY(-34px);
+}
+
+}
@@ -0,0 +1,189 @@
+/* Remove close button from firstrunwizard */
+#closeWizard {
+	display: none !important;
+}
+
+/*
+    Colorbox Core Style:
+    The following CSS is consistent between example themes and should not be altered.
+*/
+#colorbox,#cboxOverlay,#cboxWrapper {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 9999;
+	overflow: hidden;
+}
+
+#cboxWrapper {
+	max-width: none;
+}
+
+#cboxOverlay {
+	position: fixed;
+	width: 100%;
+	height: 100%;
+}
+
+#cboxMiddleLeft,#cboxBottomLeft {
+	clear: left;
+}
+
+#cboxContent {
+	position: relative;
+}
+
+#cboxLoadedContent {
+	overflow: auto;
+	-webkit-overflow-scrolling: touch;
+}
+
+#cboxTitle {
+	margin: 0;
+}
+
+#cboxLoadingOverlay,#cboxLoadingGraphic {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+}
+
+#cboxPrevious,#cboxNext,#cboxClose,#cboxSlideshow {
+	cursor: pointer;
+}
+
+.cboxPhoto {
+	float: left;
+	margin: auto;
+	border: 0;
+	display: block;
+	max-width: none;
+	-ms-interpolation-mode: bicubic;
+}
+
+.cboxIframe {
+	width: 100%;
+	height: 100%;
+	display: block;
+	border: 0;
+}
+
+#colorbox,#cboxContent,#cboxLoadedContent {
+	box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	-webkit-box-sizing: content-box;
+}
+
+/* 
+    User Style:
+    Change the following styles to modify the appearance of Colorbox.  They are
+    ordered & tabbed in a way that represents the nesting of the generated HTML.
+*/
+#cboxOverlay {
+	background: #000;
+}
+
+#colorbox {
+	
+}
+
+#cboxContent {
+	margin-top: 20px;
+}
+
+.cboxIframe {
+	background: #fff;
+}
+
+#cboxError {
+	padding: 50px;
+	border: 0px solid #ccc;
+}
+
+#cboxLoadedContent {
+	border: 0px solid #555;
+	background: #fff;
+	border-radius: 5px;
+}
+
+#cboxTitle {
+	position: absolute;
+	top: -20px;
+	left: 0;
+	color: #ccc;
+}
+
+#cboxCurrent {
+	position: absolute;
+	top: -20px;
+	right: 0px;
+	color: #ccc;
+}
+
+#cboxSlideshow {
+	position: absolute;
+	top: -20px;
+	right: 90px;
+	color: #fff;
+}
+
+#cboxPrevious:hover {
+	background-position: bottom left;
+}
+
+#cboxNext:hover {
+	background-position: bottom right;
+}
+
+#cboxLoadingOverlay {
+	background: #fff;
+}
+
+#cboxClose {
+   position: absolute;
+   top: 5px;
+   right: 5px;
+   display: block;
+   opacity: 0.5;
+   width: 19px !important;
+   height: 19px;
+   border: 0px;
+   text-indent: -9999px;
+   background-color: #fff;
+}
+#cboxClose:before {
+   content: '×';
+   position: absolute;
+   top: 0px;
+   left: 0px;
+   display: block;
+   width: 19px;
+   height: 19px;
+   opacity: 0.5;
+   text-indent: 0;
+   text-align: center;
+   line-height: 19px;
+   font-size: 19px;
+}
+
+#cboxClose:before:hover {
+   opacity: 1;
+}
+
+#cboxClose:hover {
+   background-position: right center !important;
+   opacity: 1.0;
+}
+
+/*
+  The following fixes a problem where IE7 and IE8 replace a PNG's alpha transparency with a black fill
+  when an alpha filter (opacity change) is set on the element or ancestor element.  This style is not applied to or needed in IE9.
+  See: http://jacklmoore.com/notes/ie-transparency-problems/
+*/
+.cboxIE #cboxTopLeft,.cboxIE #cboxTopCenter,.cboxIE #cboxTopRight,.cboxIE #cboxBottomLeft,.cboxIE #cboxBottomCenter,.cboxIE #cboxBottomRight,.cboxIE #cboxMiddleLeft,.cboxIE #cboxMiddleRight
+	{
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,
+		endColorstr=#00FFFFFF);
+}
@@ -0,0 +1,241 @@
+/* basic scrollbar styling */
+/* vertical scrollbar */
+.mCSB_container {
+	width: auto;
+	margin-right: 30px;
+	overflow: hidden;
+}
+
+.mCSB_container.mCS_no_scrollbar {
+	margin-right: 0;
+}
+
+.mCS_disabled .mCSB_container.mCS_no_scrollbar,.mCS_destroyed .mCSB_container.mCS_no_scrollbar
+	{
+	margin-right: 30px;
+}
+
+.mCustomScrollBox .mCSB_scrollTools {
+	width: 16px;
+	height: 100%;
+	top: 0;
+	right: 0;
+}
+
+.mCSB_scrollTools .mCSB_draggerContainer {
+	height: 100%;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+.mCSB_scrollTools .mCSB_buttonUp+.mCSB_draggerContainer {
+	padding-bottom: 40px;
+}
+
+.mCSB_scrollTools .mCSB_draggerRail {
+	width: 2px;
+	height: 100%;
+	margin: 0 auto;
+	-webkit-border-radius: 10px;
+	-moz-border-radius: 10px;
+	border-radius: 10px;
+}
+
+.mCSB_scrollTools .mCSB_dragger {
+	cursor: pointer;
+	width: 100%;
+	height: 30px;
+}
+
+.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar {
+	width: 4px;
+	height: 100%;
+	margin: 0 auto;
+	-webkit-border-radius: 10px;
+	-moz-border-radius: 10px;
+	border-radius: 10px;
+	text-align: center;
+}
+
+.mCSB_scrollTools .mCSB_buttonUp,.mCSB_scrollTools .mCSB_buttonDown {
+	height: 20px;
+	overflow: hidden;
+	margin: 0 auto;
+	cursor: pointer;
+}
+
+.mCSB_scrollTools .mCSB_buttonDown {
+	bottom: 0;
+	margin-top: -40px;
+}
+/* horizontal scrollbar */
+.mCSB_horizontal .mCSB_container {
+	height: auto;
+	margin-right: 0;
+	margin-bottom: 30px;
+	overflow: hidden;
+}
+
+.mCSB_horizontal .mCSB_container.mCS_no_scrollbar {
+	margin-bottom: 0;
+}
+
+.mCS_disabled .mCSB_horizontal .mCSB_container.mCS_no_scrollbar,.mCS_destroyed .mCSB_horizontal .mCSB_container.mCS_no_scrollbar
+	{
+	margin-right: 0;
+	margin-bottom: 30px;
+}
+
+.mCSB_horizontal.mCustomScrollBox .mCSB_scrollTools {
+	width: 100%;
+	height: 16px;
+	top: auto;
+	right: auto;
+	bottom: 0;
+	left: 0;
+	overflow: hidden;
+}
+
+.mCSB_horizontal .mCSB_scrollTools .mCSB_draggerContainer {
+	height: 100%;
+	width: auto;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	overflow: hidden;
+}
+
+.mCSB_horizontal .mCSB_scrollTools .mCSB_buttonLeft+.mCSB_draggerContainer
+	{
+	padding-bottom: 0;
+	padding-right: 20px;
+}
+
+.mCSB_horizontal .mCSB_scrollTools .mCSB_draggerRail {
+	width: 100%;
+	height: 2px;
+	margin: 7px 0;
+	-webkit-border-radius: 10px;
+	-moz-border-radius: 10px;
+	border-radius: 10px;
+}
+
+.mCSB_horizontal .mCSB_scrollTools .mCSB_dragger {
+	width: 30px;
+	height: 100%;
+}
+
+.mCSB_horizontal .mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar {
+	width: 100%;
+	height: 4px;
+	margin: 6px auto;
+	-webkit-border-radius: 10px;
+	-moz-border-radius: 10px;
+	border-radius: 10px;
+}
+
+.mCSB_horizontal .mCSB_scrollTools .mCSB_buttonLeft,.mCSB_horizontal .mCSB_scrollTools .mCSB_buttonRight
+	{
+	width: 20px;
+	height: 100%;
+	overflow: hidden;
+	margin: 0 auto;
+	cursor: pointer;
+	float: left;
+}
+
+.mCSB_horizontal .mCSB_scrollTools .mCSB_buttonRight {
+	right: 0;
+	bottom: auto;
+	margin-left: -40px;
+	margin-top: -16px;
+	float: right;
+}
+
+/* default scrollbar colors and backgrounds */
+.mCustomScrollBox .mCSB_scrollTools {
+	opacity: 0.75;
+}
+
+.mCustomScrollBox:hover .mCSB_scrollTools {
+	opacity: 1;
+}
+
+.mCSB_scrollTools .mCSB_draggerRail {
+	background: #000; /* rgba fallback */
+	background: rgba(0, 0, 0, 0.4);
+	filter: "alpha(opacity=40)";
+	-ms-filter: "alpha(opacity=40)"; /* old ie */
+}
+
+.mCSB_scrollTools .mCSB_dragger .mCSB_dragger_bar {
+	background: #fff; /* rgba fallback */
+	background: rgba(255, 255, 255, 0.75);
+	filter: "alpha(opacity=75)";
+	-ms-filter: "alpha(opacity=75)"; /* old ie */
+}
+
+.mCSB_scrollTools .mCSB_dragger:hover .mCSB_dragger_bar {
+	background: rgba(255, 255, 255, 0.85);
+	filter: "alpha(opacity=85)";
+	-ms-filter: "alpha(opacity=85)"; /* old ie */
+}
+
+.mCSB_scrollTools .mCSB_dragger:active .mCSB_dragger_bar,.mCSB_scrollTools .mCSB_dragger.mCSB_dragger_onDrag .mCSB_dragger_bar
+	{
+	background: rgba(255, 255, 255, 0.9);
+	filter: "alpha(opacity=90)";
+	-ms-filter: "alpha(opacity=90)"; /* old ie */
+}
+
+.mCSB_scrollTools .mCSB_buttonUp,.mCSB_scrollTools .mCSB_buttonDown,.mCSB_scrollTools .mCSB_buttonLeft,.mCSB_scrollTools .mCSB_buttonRight
+	{
+	background-image: url(mCSB_buttons.png);
+	background-repeat: no-repeat;
+	opacity: 0.4;
+	filter: "alpha(opacity=40)";
+	-ms-filter: "alpha(opacity=40)"; /* old ie */
+}
+
+.mCSB_scrollTools .mCSB_buttonUp {
+	background-position: 0 0;
+	/* 
+	sprites locations are 0 0/-16px 0/-32px 0/-48px 0 (light) and -80px 0/-96px 0/-112px 0/-128px 0 (dark) 
+	*/
+}
+
+.mCSB_scrollTools .mCSB_buttonDown {
+	background-position: 0 -20px;
+	/* 
+	sprites locations are 0 -20px/-16px -20px/-32px -20px/-48px -20px (light) and -80px -20px/-96px -20px/-112px -20px/-128px -20px (dark) 
+	*/
+}
+
+.mCSB_scrollTools .mCSB_buttonLeft {
+	background-position: 0 -40px;
+	/* 
+	sprites locations are 0 -40px/-20px -40px/-40px -40px/-60px -40px (light) and -80px -40px/-100px -40px/-120px -40px/-140px -40px (dark) 
+	*/
+}
+
+.mCSB_scrollTools .mCSB_buttonRight {
+	background-position: 0 -56px;
+	/* 
+	sprites locations are 0 -56px/-20px -56px/-40px -56px/-60px -56px (light) and -80px -56px/-100px -56px/-120px -56px/-140px -56px (dark) 
+	*/
+}
+
+.mCSB_scrollTools .mCSB_buttonUp:hover,.mCSB_scrollTools .mCSB_buttonDown:hover,.mCSB_scrollTools .mCSB_buttonLeft:hover,.mCSB_scrollTools .mCSB_buttonRight:hover
+	{
+	opacity: 0.75;
+	filter: "alpha(opacity=75)";
+	-ms-filter: "alpha(opacity=75)"; /* old ie */
+}
+
+.mCSB_scrollTools .mCSB_buttonUp:active,.mCSB_scrollTools .mCSB_buttonDown:active,.mCSB_scrollTools .mCSB_buttonLeft:active,.mCSB_scrollTools .mCSB_buttonRight:active
+	{
+	opacity: 0.9;
+	filter: "alpha(opacity=90)";
+	-ms-filter: "alpha(opacity=90)"; /* old ie */
+}
@@ -2,35 +2,81 @@
 * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
 * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
 *
- * Version: 1.0.0
- * 
+ * Version: 1.3.3 + pr#94
+ *
 */
 (function($) {

-  jQuery.fn.extend({
+  $.fn.extend({
    slimScroll: function(options) {

      var defaults = {
-        wheelStep : 20,
+
+        // width in pixels of the visible scroll area
        width : 'auto',
+
+        // height in pixels of the visible scroll area
        height : '250px',
+
+        // width in pixels of the scrollbar and rail
        size : '7px',
+
+        // scrollbar color, accepts any hex/color value
        color: '#000',
+
+        // scrollbar position - left/right
        position : 'right',
+
+        // distance in pixels between the side edge and the scrollbar
        distance : '1px',
+
+        // default scroll position on load - top / bottom / $('selector')
        start : 'top',
+
+        // sets scrollbar opacity
        opacity : .4,
+
+        // enables always-on mode for the scrollbar
        alwaysVisible : false,
-        disableFadeOut: false,
+
+        // check if we should hide the scrollbar when user is hovering over
+        disableFadeOut : false,
+
+        // sets visibility of the rail
        railVisible : false,
+
+        // sets rail color
        railColor : '#333',
-        railOpacity : '0.2',
+
+        // sets rail opacity
+        railOpacity : .2,
+
+        // whether  we should use jQuery UI Draggable to enable bar dragging
+        railDraggable : true,
+
+        // defautlt CSS class of the slimscroll rail
        railClass : 'slimScrollRail',
+
+        // defautlt CSS class of the slimscroll bar
        barClass : 'slimScrollBar',
+
+        // defautlt CSS class of the slimscroll wrapper
        wrapperClass : 'slimScrollDiv',
+
+        // check if mousewheel should scroll the window if we reach top/bottom
        allowPageScroll : false,
-        scroll : 0,
-        touchScrollStep : 200
+
+        // scroll amount applied to each mouse wheel step
+        wheelStep : 20,
+
+        // scroll amount applied when user is using gestures
+        touchScrollStep : 200,
+
+        // sets border radius
+        borderRadius: '7px',
+
+        // sets border radius of the rail
+        railBorderRadius : '7px'
      };

      var o = $.extend(defaults, options);
@@ -38,7 +84,7 @@
      // do it for every element that matches selector
      this.each(function(){

-      var isOverPanel, isOverBar, isDragg, queueHide, touchDif, 
+      var isOverPanel, isOverBar, isDragg, queueHide, touchDif,
        barHeight, percentScroll, lastScroll,
        divS = '<div></div>',
        minBarHeight = 30,
@@ -48,20 +94,33 @@
        var me = $(this);

        // ensure we are not binding it again
-        if (me.parent().hasClass('slimScrollDiv'))
-        { 
+        if (me.parent().hasClass(o.wrapperClass))
+        {
            // start from last bar position
            var offset = me.scrollTop();

            // find bar and rail
-            bar = me.parent().find('.slimScrollBar');
-            rail = me.parent().find('.slimScrollRail');
-            
+            bar = me.parent().find('.' + o.barClass);
+            rail = me.parent().find('.' + o.railClass);
+
            getBarHeight();

            // check if we should scroll existing instance
-            if (options)
+            if ($.isPlainObject(options))
            {
+              // Pass height: auto to an existing slimscroll object to force a resize after contents have changed
+              if ( 'height' in options && options.height == 'auto' ) {
+                me.parent().css('height', 'auto');
+                me.css('height', 'auto');
+                var height = me.parent().parent().height();
+                me.parent().css('height', height);
+                me.css('height', height);
+              } else if ('height' in options) {
+                var h = options.height;
+                me.parent().css('height', h);
+                me.css('height', h);
+              }
+
              if ('scrollTo' in options)
              {
                // jump to a static point
@@ -72,6 +131,14 @@
                // jump by value pixels
                offset += parseInt(o.scrollBy);
              }
+              else if ('destroy' in options)
+              {
+                // remove slimscroll elements
+                bar.remove();
+                rail.remove();
+                me.unwrap();
+                return;
+              }

              // scroll content by the given offset
              scrollContent(offset, false, true);
@@ -79,9 +146,16 @@

            return;
        }
+        else if ($.isPlainObject(options))
+        {
+            if ('destroy' in options)
+            {
+               return;
+            }
+        }

        // optionally set height to the parent's height
-        o.height = (o.height == 'auto') ? me.parent().innerHeight() : o.height;
+        o.height = (o.height == 'auto') ? me.parent().height() : o.height;

        // wrap content
        var wrapper = $(divS)
@@ -101,7 +175,7 @@
        });

        // create scrollbar rail
-        var rail  = $(divS)
+        var rail = $(divS)
          .addClass(o.railClass)
          .css({
            width: o.size,
@@ -109,7 +183,7 @@
            position: 'absolute',
            top: 0,
            display: (o.alwaysVisible && o.railVisible) ? 'block' : 'none',
-            'border-radius': o.size,
+            'border-radius': o.railBorderRadius,
            background: o.railColor,
            opacity: o.railOpacity,
            zIndex: 90
@@ -125,10 +199,10 @@
            top: 0,
            opacity: o.opacity,
            display: o.alwaysVisible ? 'block' : 'none',
-            'border-radius' : o.size,
-            BorderRadius: o.size,
-            MozBorderRadius: o.size,
-            WebkitBorderRadius: o.size,
+            'border-radius' : o.borderRadius,
+            BorderRadius: o.borderRadius,
+            MozBorderRadius: o.borderRadius,
+            WebkitBorderRadius: o.borderRadius,
            zIndex: 99
          });

@@ -144,18 +218,31 @@
        me.parent().append(bar);
        me.parent().append(rail);

-        // make it draggable
-        bar.draggable({ 
-          axis: 'y', 
-          containment: 'parent',
-          start: function() { isDragg = true; },
-          stop: function() { isDragg = false; hideBar(); },
-          drag: function(e) 
-          { 
-            // scroll content
-            scrollContent(0, $(this).position().top, false);
-          }
-        });
+        // make it draggable and no longer dependent on the jqueryUI
+        if (o.railDraggable){
+          bar.bind("mousedown", function(e) {
+            var $doc = $(document);
+            isDragg = true;
+            t = parseFloat(bar.css('top'));
+            pageY = e.pageY;
+
+            $doc.bind("mousemove.slimscroll", function(e){
+              currTop = t + e.pageY - pageY;
+              bar.css('top', currTop);
+              scrollContent(0, bar.position().top, false);// scroll content
+            });
+
+            $doc.bind("mouseup.slimscroll", function(e) {
+              isDragg = false;hideBar();
+              $doc.unbind('.slimscroll');
+            });
+            return false;
+          }).bind("selectstart.slimscroll", function(e){
+            e.stopPropagation();
+            e.preventDefault();
+            return false;
+          });
+        }

        // on rail over
        rail.hover(function(){
@@ -191,18 +278,44 @@
        });

        me.bind('touchmove', function(e){
-          // prevent scrolling the page
-          e.originalEvent.preventDefault();
+          // prevent scrolling the page if necessary
+          if(!releaseScroll)
+          {
+            e.originalEvent.preventDefault();
+            }
          if (e.originalEvent.touches.length)
          {
            // see how far user swiped
            var diff = (touchDif - e.originalEvent.touches[0].pageY) / o.touchScrollStep;
            // scroll content
            scrollContent(diff, true);
+            touchDif = e.originalEvent.touches[0].pageY;
          }
        });

-        var _onWheel = function(e)
+        // set up initial height
+        getBarHeight();
+
+        // check start position
+        if (o.start === 'bottom')
+        {
+          // scroll content to bottom
+          bar.css({ top: me.outerHeight() - bar.outerHeight() });
+          scrollContent(0, true);
+        }
+        else if (o.start !== 'top')
+        {
+          // assume jQuery selector
+          scrollContent($(o.start).position().top, null, true);
+
+          // make sure bar stays hidden
+          if (!o.alwaysVisible) { bar.hide(); }
+        }
+
+        // attach scroll events
+        attachWheel();
+
+        function _onWheel(e)
        {
          // use mouse wheel only when mouse is over
          if (!isOverPanel) { return; }
@@ -213,8 +326,11 @@
          if (e.wheelDelta) { delta = -e.wheelDelta/120; }
          if (e.detail) { delta = e.detail / 3; }

-          // scroll content
-          scrollContent(delta, true);
+          var target = e.target || e.srcTarget || e.srcElement;
+          if ($(target).closest('.' + o.wrapperClass).is(me.parent())) {
+            // scroll content
+            scrollContent(delta, true);
+          }

          // stop window scroll
          if (e.preventDefault && !releaseScroll) { e.preventDefault(); }
@@ -223,16 +339,24 @@

        function scrollContent(y, isWheel, isJump)
        {
+          releaseScroll = false;
          var delta = y;
          var maxTop = me.outerHeight() - bar.outerHeight();
-          
+
          if (isWheel)
          {
            // move bar with mouse wheel
            delta = parseInt(bar.css('top')) + y * parseInt(o.wheelStep) / 100 * bar.outerHeight();

-            // move bar, make sure it doesn't go out  
+            // move bar, make sure it doesn't go out
            delta = Math.min(Math.max(delta, 0), maxTop);
+
+            // if scrolling down, make sure a fractional change to the
+            // scroll position isn't rounded away when the scrollbar's CSS is set
+            // this flooring of delta would happened automatically when
+            // bar.css is set below, but we floor here for clarity
+            delta = (y > 0) ? Math.ceil(delta) : Math.floor(delta);
+
            // scroll the scrollbar
            bar.css({ top: delta + 'px' });
          }
@@ -245,7 +369,6 @@
          {
            delta = y;
            var offsetTop = delta / me[0].scrollHeight * me.outerHeight();
-
            offsetTop = Math.min(Math.max(offsetTop, 0), maxTop);
            bar.css({ top: offsetTop + 'px' });
          }
@@ -253,6 +376,9 @@
          // scroll content
          me.scrollTop(delta);

+          // fire scrolling event
+          me.trigger('slimscrolling', ~~delta);
+
          // ensure bar is visible
          showBar();

@@ -260,31 +386,29 @@
          hideBar();
        }

-        var attachWheel = function()
+        function attachWheel()
        {
          if (window.addEventListener)
          {
            this.addEventListener('DOMMouseScroll', _onWheel, false );
            this.addEventListener('mousewheel', _onWheel, false );
-          } 
+          }
          else
          {
            document.attachEvent("onmousewheel", _onWheel)
          }
        }

-        // attach scroll events
-        attachWheel();
-
        function getBarHeight()
        {
          // calculate scrollbar height and make sure it is not too small
          barHeight = Math.max((me.outerHeight() / me[0].scrollHeight) * me.outerHeight(), minBarHeight);
          bar.css({ height: barHeight + 'px' });
-        }

-        // set up initial height
-        getBarHeight();
+          // hide scrollbar if content is not long enough
+          var display = barHeight == me.outerHeight() ? 'none' : 'block';
+          bar.css({ display: display });
+        }

        function showBar()
        {
@@ -293,18 +417,22 @@
          clearTimeout(queueHide);

          // when bar reached top or bottom
-          if (percentScroll == ~~ percentScroll)
+          if (percentScroll == ~~percentScroll)
          {
-            //release wheel 
+            //release wheel
            releaseScroll = o.allowPageScroll;
-            
+
            // publish approporiate event
            if (lastScroll != percentScroll)
            {
-                var msg = (~~percentScroll == 0) ? 'top' : 'bottom'; 
+                var msg = (~~percentScroll == 0) ? 'top' : 'bottom';
                me.trigger('slimscroll', msg);
            }
          }
+          else
+          {
+            releaseScroll = false;
+          }
          lastScroll = percentScroll;

          // show only when required
@@ -324,7 +452,7 @@
          {
            queueHide = setTimeout(function(){
              if (!(o.disableFadeOut && isOverPanel) && !isOverBar && !isDragg)
-              { 
+              {
                bar.fadeOut('slow');
                rail.fadeOut('slow');
              }
@@ -332,30 +460,15 @@
          }
        }

-        // check start position
-        if (o.start == 'bottom') 
-        {
-          // scroll content to bottom
-          bar.css({ top: me.outerHeight() - bar.outerHeight() });
-          scrollContent(0, true);
-        }
-        else if (typeof o.start == 'object')
-        {
-          // scroll content
-          scrollContent($(o.start).position().top, null, true);
-
-          // make sure bar stays hidden
-          if (!o.alwaysVisible) { bar.hide(); }
-        }
      });
-      
+
      // maintain chainability
      return this;
    }
  });

-  jQuery.fn.extend({
-    slimscroll: jQuery.fn.slimScroll
+  $.fn.extend({
+    slimscroll: $.fn.slimScroll
  });

 })(jQuery);
@@ -7,6 +7,8 @@
 * 
 * Authors: - Michael Weibel <michael.weibel@gmail.com> - Klaus Herberth <klaus@jsxc.org>
 * Copyright: - Michael Weibel <michael.weibel@gmail.com>
+ * 
+ * @license MIT
 */

 (function($) {
@@ -3,9 +3,10 @@
 * Klaus Herberth, 2014
 */

-// This code was written by Tyler Akins and has been placed in the
-// public domain.  It would be nice if you left this header intact.
-// Base64 code from Tyler Akins -- http://rumkin.com
+/*! This code was written by Tyler Akins and has been placed in the
+   public domain.  It would be nice if you left this header intact.
+   Base64 code from Tyler Akins -- http://rumkin.com
+*/

 var Base64 = (function () {
    var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
@@ -84,7 +85,7 @@ var Base64 = (function () {
    return obj;
 })();

-/*
+/*!
 * A JavaScript implementation of the Secure Hash Algorithm, SHA-1, as defined
 * in FIPS PUB 180-1
 * Version 2.1a Copyright Paul Johnston 2000 - 2002.
@@ -261,7 +262,7 @@ function binb2b64(binarray)
  return str;
 }

-/*
+/*!
 * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
 * Digest Algorithm, as defined in RFC 1321.
 * Version 2.1 Copyright (C) Paul Johnston 1999 - 2002.
@@ -469,7 +470,7 @@ var MD5 = (function () {
    return obj;
 })();

-/*
+/*!
    This program is distributed under the terms of the MIT license.
    Please see the LICENSE file for details.

@@ -1,22 +1,28 @@
 {
-   "name": "jsxc",
-   "version": "0.7.2",
-   "description": "Real-time chat app",
-   "homepage": "http://www.jsxc.org/",
-   "bugs": "https://github.com/sualko/jsxc/issues",
-   "license": "MIT",
-   "author": "Klaus Herberth <klaus@jsxc.org>",
-   "repository": {
-       "type": "git",
-       "url": "https://github.com/sualko/jsxc"
-   },
-   "devDependencies": {
-       "grunt": "~0.4.4",
-       "grunt-cli": "~0.1.13",
-       "grunt-contrib-clean": "~0.5.0",
-       "grunt-contrib-jshint": "~0.9.2",
-       "grunt-contrib-copy": "~0.5.0",
-       "grunt-banner": "~0.2.2",
-       "grunt-text-replace": "~0.3.11"
-   }
+  "name": "jsxc",
+  "version": "1.0.0",
+  "description": "Real-time chat app",
+  "homepage": "http://www.jsxc.org/",
+  "bugs": "https://github.com/sualko/jsxc/issues",
+  "license": "MIT",
+  "author": "Klaus Herberth <klaus@jsxc.org>",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/sualko/jsxc"
+  },
+  "devDependencies": {
+    "grunt": "~0.4.4",
+    "grunt-banner": "~0.2.2",
+    "grunt-cli": "~0.1.13",
+    "grunt-contrib-clean": "~0.5.0",
+    "grunt-contrib-compress": "^0.10.0",
+    "grunt-contrib-concat": "^0.5.0",
+    "grunt-contrib-copy": "~0.5.0",
+    "grunt-contrib-jshint": "~0.9.2",
+    "grunt-contrib-uglify": "^0.6.0",
+    "grunt-jsdoc": "^0.5.7",
+    "grunt-search": "^0.1.6",
+    "grunt-shell": "^1.1.1",
+    "grunt-text-replace": "~0.3.11"
+  }
 }
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+grunt commit
@@ -0,0 +1,11 @@
+Rotary-Phone6.mp3
+===
+Creator: David English
+Source: http://www.beepzoid.com/old-phones/
+License: unknown
+
+Ping1.mp3
+===
+Creator: CameronMusic
+Source: https://soundcloud.com/freefilmandgamemusic/ping-1?in=freefilmandgamemusic/sets/free-notification-sounds-and
+License: cc 3.0, http://creativecommons.org/licenses/by/3.0/
Autor	SHA1	Mensagem	Data
sualko	2b6dd690f4	build v1.0.0	2014-11-06 14:16:16 +01:00
Klaus Herberth	292e7646b6	fix duplicates on roster change	2014-11-05 23:16:17 +01:00
Klaus Herberth	9c137be6ae	stop propagation	2014-11-05 23:11:22 +01:00
sualko	c711167d3f	fix own presence color	2014-11-04 15:44:49 +01:00
sualko	4c388212eb	add default xmpp priorites to options	2014-11-04 15:41:36 +01:00
sualko	b843aa2f03	fix jsxc.options.get	2014-11-04 15:35:36 +01:00
sualko	8d1fba000a	update and generate doc	2014-11-04 15:32:23 +01:00
sualko	e9f0634d29	remove flash check	2014-11-04 12:54:42 +01:00
sualko	a69b70af1e	build 1.0.0-beta2	2014-10-31 14:05:12 +01:00
sualko	341db9e625	change position of message trigger	2014-10-31 13:54:45 +01:00
sualko	67d2c12640	preventDefault for dialog and clean otr list	2014-10-31 13:39:14 +01:00
sualko	c0fae24dcd	change cursor to pointer for some elements	2014-10-31 13:23:41 +01:00
Klaus	05d9aaa01d	fix update video icon	2014-10-30 23:02:40 +01:00
sualko	8cd97ec3e1	build 1.0.0-beta1	2014-10-29 14:13:39 +01:00
sualko	58e2fccf95	add new event restoreCompleted.jsxc	2014-10-29 11:48:25 +01:00
sualko	4b541d462a	fix emoticon size from #86	2014-10-29 11:15:20 +01:00
Klaus	310ac4e0a6	Merge pull request #86 from Zauberstuhl/rails_assets In respect of rails assets we should define images in css	2014-10-29 11:12:15 +01:00
sualko	53b44961ea	support vcard retrieval from unknown jid	2014-10-29 11:08:58 +01:00
sualko	8271e64cf7	fix vcard on second tab	2014-10-29 10:51:49 +01:00
sualko	27438984e1	disable webrtc on second tab	2014-10-28 16:11:59 +01:00
sualko	0fb7de74ce	fix otr enable	2014-10-28 16:10:58 +01:00
sualko	3db02b0560	Add spot to messages and add some translations	2014-10-28 15:30:17 +01:00
sualko	e2dfb6bc94	Add email spot	2014-10-24 17:28:21 +02:00
sualko	55dbbdb636	Handle unknown jids	2014-10-24 16:37:25 +02:00
sualko	308ccc1426	Add has-come-online notification	2014-10-24 14:22:36 +02:00
sualko	7f1a011b1b	improve notifications - sync sound and message - add icon	2014-10-24 13:52:39 +02:00
sualko	d102d41f6b	detec uri scheme in message	2014-10-23 14:57:03 +02:00
sualko	91def2febc	detect xmpp: url in message	2014-10-23 14:47:40 +02:00
sualko	7ea444276b	add uri query actions	2014-10-23 12:29:06 +02:00
sualko	f810a8a28f	fix opened flag	2014-10-23 11:11:20 +02:00
sualko	2acf47a872	add opened flag to toggle list	2014-10-23 00:58:35 +02:00
sualko	906136245a	Implement XEP-0147 URI Scheme Query (close #39 )	2014-10-21 16:52:50 +02:00
sualko	a053753e10	detect email in message	2014-10-20 13:13:22 +02:00
sualko	e996296b7f	add unread flag to roster and scroll to target window	2014-10-16 13:04:58 +02:00
sualko	d4a31dc8fc	end all private conversations on logout	2014-10-15 15:49:59 +02:00
sualko	c8ca2734e0	handle loadSettings failure	2014-10-15 14:20:32 +02:00
sualko	03e8ae8d1d	remove email pattern from contact dialog	2014-10-15 13:17:57 +02:00
sualko	d626eb355f	improve smp	2014-10-15 13:00:04 +02:00
sualko	862c124366	esc closes window	2014-10-15 11:21:30 +02:00
Lukas Matt	3c2cf893be	Adjust css namespace to jsxc	2014-10-14 23:24:36 +02:00
Lukas Matt	ac8f014377	In respect of rails assets we should define images in css	2014-10-14 19:28:10 +02:00
sualko	d0e16c0a2a	fix window toggle in video mode	2014-10-14 17:14:36 +02:00
sualko	cb926a1dec	fix video icon	2014-10-14 16:56:16 +02:00
sualko	7aac1d6c28	set focus to input on textarea click	2014-10-09 12:58:42 +02:00
sualko	25a982f9c3	request notification permission silent	2014-10-09 12:54:46 +02:00
sualko	76da9c0fd1	improve video window - add loader - update video icon on presence - slide chat - cancel call on ice failure - fix info for initiator - only request available user media (chrome)	2014-10-09 12:33:23 +02:00
sualko	a9d167acda	Merge branch 'video-window-design' of https://github.com/sualko/jsxc	2014-10-09 08:22:34 +02:00
sualko	32960f39b0	fix non-square avatars (close #68 )	2014-10-08 15:22:19 +02:00
sualko	3e1c1ded67	improve login box (close #82 )	2014-10-08 15:06:52 +02:00
sualko	e19da058f6	vCard: swap top and bottom (close #69 )	2014-10-08 14:31:33 +02:00
sualko	80b5a4a350	replace user identifier (fix #78 ) from css id to bar jid.	2014-10-08 14:05:40 +02:00
sualko	5c10a738cb	Merge branch 'MarcelWaldvogel-language-update'	2014-09-24 13:43:03 +02:00
sualko	855b776ca2	update language vars	2014-09-24 13:38:37 +02:00
sualko	735016e676	Merge branch 'language-update' of git://github.com/MarcelWaldvogel/jsxc into MarcelWaldvogel-language-update	2014-09-24 13:18:51 +02:00
sualko	46897f0e66	handle resource case sensitive	2014-09-24 12:58:36 +02:00
sualko	f1918e06cb	add disco dtls feature (#65 )	2014-09-24 12:28:58 +02:00
Klaus Herberth	3405d0e3c2	move chat window beside video	2014-09-17 11:36:30 +02:00
Marcel Waldvogel	c280251e3c	Language update More consistent and user-friendly language (EN, DE) and dialog layout	2014-09-14 12:30:34 +02:00
sualko	0954c245c3	build v1.0.0-alpha1	2014-09-08 14:25:21 +02:00
sualko	1aa44434b3	intercept ff snapshot security error	2014-09-08 14:21:59 +02:00
sualko	c1bd08b3e4	minor style change	2014-09-08 06:31:41 -04:00
sualko	f298364a37	fix message delivery (close #17 ) - Show warning if we receive an encrypted message with unknown instance tag - Enable ake on received otr error	2014-09-08 10:57:12 +02:00
sualko	e061670880	add bouncing effect to notice	2014-09-08 10:29:02 +02:00
sualko	6680283cea	minor window scrollbar improvement - hide unneeded buttons - update sb after window is closed	2014-09-08 10:05:21 +02:00
Klaus Herberth	cb6b1345e0	fix cross-browser visible api - test type of document.hidden	2014-09-07 11:38:28 +02:00
sualko	09a83236ab	add scrollbar to window list	2014-09-05 15:40:03 +02:00
sualko	a68bae3288	generate dsa key in background (close #45 )	2014-09-04 15:52:39 +02:00
sualko	a7f4073f0b	fix wrong avatars	2014-09-04 11:11:06 +02:00
sualko	8248854ce7	make chat window resizable - update jquery.slimscroll.js - use jquery resizable	2014-09-02 16:16:40 +02:00
sualko	88f225f564	minor webrtc fixes - fix incoming call window - add information to chat window - update strophe.jingle	2014-09-02 14:09:57 +02:00
sualko	8c1ba13449	fix caps node property	2014-09-02 13:18:46 +02:00
sualko	eb7cef099b	Display more information per user	2014-09-02 13:12:07 +02:00
sualko	8ae8d2f7bf	add translation	2014-09-02 11:04:58 +02:00
sualko	33d41e2a84	build v0.8.2	2014-08-20 12:05:34 +02:00
sualko	ca816760c8	add translation	2014-08-20 12:01:49 +02:00
sualko	31d6121273	update example	2014-08-19 13:39:39 +02:00
sualko	8bc299739d	allow string\|boolean as config param	2014-08-19 13:39:03 +02:00
sualko	263cb2ecb7	update grunt abort if console.log is found or if no entry for current version exists in CHANGELOG.md	2014-08-19 12:54:53 +02:00
sualko	c7e37147a7	write log to console only if debug flag is set	2014-08-19 12:48:48 +02:00
sualko	34c880aa5c	use custom username (fix sualko/jsxc#58 )	2014-08-19 12:16:31 +02:00
sualko	165dba73a4	build v0.8.1	2014-08-12 16:20:22 +02:00
sualko	f2770d7a44	allow user to define xmpp & permanent settings	2014-08-12 15:42:17 +02:00
sualko	b7c4cac550	generalize fieldset style & add readonly style	2014-08-12 15:32:38 +02:00
sualko	656a82cf17	remove pass-icon	2014-08-12 15:31:29 +02:00
sualko	3d4ece2561	remove trace call	2014-08-07 12:12:32 +02:00
sualko	52b16e9ef0	add example	2014-07-03 13:00:51 +02:00
sualko	a07347cc22	fix login form without id submit	2014-07-03 12:59:43 +02:00
sualko	aa8bcf52de	build v0.8.0	2014-07-02 12:10:13 +02:00
sualko	2060b8ac69	add translation for vCard	2014-07-02 12:09:46 +02:00
sualko	8776ad565d	add expand triangle	2014-07-02 11:34:45 +02:00
Klaus	2e94cf6ba0	Add missing spanish translation	2014-06-30 13:15:31 +02:00
sualko	89bd4cdc48	build v0.8.0-beta	2014-06-27 15:34:27 +02:00
sualko	9d87d90141	adjust jsxc root and add sound files	2014-06-27 12:26:14 +02:00
sualko	b6e4a6baca	fix priority issue (`46116a3e8d`)	2014-06-27 12:18:43 +02:00
sualko	4dc319502f	looking for username and password field (fix #47 )	2014-06-26 15:17:55 +02:00
sualko	98e9f77074	use browser input check for contact dialog	2014-06-26 15:00:22 +02:00
sualko	37ac46f55b	Add hint if roster is empty	2014-06-26 13:15:44 +02:00
sualko	92309b90be	Add fingerprint explanation	2014-06-26 12:36:50 +02:00
sualko	dc1a79e294	Add hint to browser-allow-button	2014-06-26 11:49:59 +02:00
sualko	5813f336a2	add close button to verification	2014-06-25 15:18:48 +02:00
sualko	46116a3e8d	add support for priorities (#48 )	2014-06-25 15:13:02 +02:00
sualko	cfc9d5a77d	show notice if no vCard is available	2014-06-25 12:51:22 +02:00
sualko	08c660a1ae	fix chat in video window	2014-06-25 12:40:01 +02:00
sualko	2140f8ad72	grayscale for one-side subscription	2014-06-25 12:14:15 +02:00
Klaus	de2eb4c7ba	Merge pull request #50 from sualko/expand_roster_item Merge expandable roster	2014-06-25 12:00:55 +02:00
sualko	075f29b040	fix rename field	2014-06-25 11:54:26 +02:00
sualko	2ceb2ab3a6	gui fixes - enable/disable video icon - adjust window highlighting - css clean up	2014-06-23 13:52:38 +02:00
sualko	21153db52d	add icons to expand item	2014-06-12 14:18:33 +02:00
sualko	45ed711ad8	add expand icon	2014-06-12 13:01:51 +02:00
sualko	bdf8ead441	clean up stylesheet	2014-06-12 12:09:48 +02:00
Klaus Herberth	73116b0b33	fix ie input field	2014-06-12 00:08:41 +02:00
sualko	995133c4d2	enhance window icons	2014-06-10 16:37:22 +02:00
sualko	4d396d4133	fix margin between sys and normal msg	2014-06-10 12:33:49 +02:00
sualko	de1c264c2b	minor window design changes	2014-06-06 15:18:42 +02:00
sualko	c6e050ab7c	fix multiple emoticon issues - change default replacement according to XEP-0038 - handle multiple emoticons (prevent double replacement) - add thumbsdown, rose, music	2014-06-06 10:22:10 +02:00
sualko	97555780c5	enhance window design	2014-06-05 14:51:40 +02:00
Klaus	14338ededa	Merge pull request #41 from johangm90/master Change chat message design	2014-06-04 18:38:45 +02:00
sualko	e7b087e8fe	Add function to display vCard	2014-06-04 17:33:38 +02:00
johangm90	94f49dabef	New chat window design	2014-06-03 18:56:28 -05:00
Klaus	c0cd443a3d	Merge pull request #40 from johangm90/master add spanish translation	2014-06-03 15:21:00 +02:00
johangm90	2f023cda05	spanish translation spanish translation spanish translation	2014-06-03 08:03:08 -05:00
Klaus	03ca06ce25	Remove redundant content (homepage)	2014-06-02 00:40:37 +02:00
				`@@ -0,0 +1 @@`
				`{"url":"numb.viagenie.ca","username":"webrtc@live.com","credential":"muazkh","ttl":43200}`