diff options
43 files changed, 137 insertions, 25 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index efe1f16..bfaf476 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +v0.7.1 / 2014-03-18 +=== +- upgrade jsxc to v0.7.1 +- replace utf8 gear with svg gear +- add missing emoticons + v0.7.0 / 2014-03-07 === - upgrade jsxc to v0.7.0 diff --git a/Gruntfile.js b/Gruntfile.js index cc0d926..fd449da 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -20,7 +20,7 @@ module.exports = function(grunt) { main: { files: [ { expand: true, - src: [ 'js/*.js', 'css/*', 'appinfo/*', 'ajax/*', 'img/*', 'templates/*', 'sound/*', 'settings.php', 'LICENSE' ], + src: [ 'js/*.js', 'css/*', 'appinfo/*', 'ajax/*', 'img/**', 'templates/*', 'sound/*', 'settings.php', 'LICENSE' ], dest: 'build/' }, { expand: true, @@ -41,6 +41,24 @@ module.exports = function(grunt) { src: [ 'build/js/*.js', 'build/css/jsxc.oc.css' ] } } + }, + replace: { + info: { + src: [ 'build/appinfo/info.xml' ], + overwrite: true, + replacements: [ { + from: /<version>[\d.]+<\/version>/, + to: "<version><%= app.version %></version>" + } ] + }, + version: { + src: [ 'build/appinfo/version' ], + overwrite: true, + replacements: [ { + from: /[\d.]+/, + to: "<%= app.version %>" + } ] + } } }); @@ -49,8 +67,9 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-contrib-clean'); grunt.loadNpmTasks('grunt-banner'); + grunt.loadNpmTasks('grunt-text-replace'); // Default task. - grunt.registerTask('default', [ 'jshint', 'clean', 'copy', 'usebanner' ]); + grunt.registerTask('default', [ 'jshint', 'clean', 'copy', 'usebanner', 'replace' ]); }; @@ -1,6 +1,6 @@ { "name": "ojsxc", - "version": "0.7.0", + "version": "0.7.1", "description": "Real-time chat app for owncloud", "homepage": "http://jsxc.org/", "license": "MIT", diff --git a/build/appinfo/info.xml b/build/appinfo/info.xml index e1bbb0e..99e105f 100644 --- a/build/appinfo/info.xml +++ b/build/appinfo/info.xml @@ -3,7 +3,7 @@ <id>ojsxc</id> <name>JavaScript XMPP Chat</name> <description>XMPP Chat with OTR</description> - <version>0.7.0</version> + <version>0.7.1</version> <licence>MIT</licence> <author>Klaus Herberth</author> <require>5</require> diff --git a/build/appinfo/version b/build/appinfo/version index bcaffe1..7deb86f 100644 --- a/build/appinfo/version +++ b/build/appinfo/version @@ -1 +1 @@ -0.7.0
\ No newline at end of file +0.7.1
\ No newline at end of file diff --git a/build/css/jsxc.oc.css b/build/css/jsxc.oc.css index f09f698..eadd3cc 100644 --- a/build/css/jsxc.oc.css +++ b/build/css/jsxc.oc.css @@ -1,5 +1,5 @@ /** - * ojsxc v0.7.0 - 2014-03-07 + * ojsxc v0.7.1 - 2014-03-18 * * Copyright (c) 2014 Klaus Herberth <klaus@jsxc.org> <br> * Released under the MIT license @@ -7,7 +7,7 @@ * Please see http://jsxc.org/ * * @author Klaus Herberth <klaus@jsxc.org> - * @version 0.7.0 + * @version 0.7.1 */ .jsxc_online,.jsxc_chat { @@ -280,10 +280,17 @@ div#jsxc_roster>.jsxc_bottom ul li:last-child { } #jsxc_menu>span { - font-size: 25px; - line-height: 30px; - font-family: "Open Sans", "Helvetica Neue", "Helvetica", "Arial", - sans-serif; + opacity: 0.5; + display:block; + width:25px; + height: 30px; + background-image: url('%appswebroot%/ojsxc/img/gear.svg'); + background-size: 18px 18px; + background-repeat: no-repeat; + background-position: center center; +} +#jsxc_menu:hover>span{ + opacity: 1; } #jsxc_notice { diff --git a/build/img/emotions/angel.png b/build/img/emotions/angel.png Binary files differnew file mode 100644 index 0000000..2d1a750 --- /dev/null +++ b/build/img/emotions/angel.png diff --git a/build/img/emotions/angry.png b/build/img/emotions/angry.png Binary files differnew file mode 100644 index 0000000..6091f9d --- /dev/null +++ b/build/img/emotions/angry.png diff --git a/build/img/emotions/beer.png b/build/img/emotions/beer.png Binary files differnew file mode 100644 index 0000000..4ca1dd7 --- /dev/null +++ b/build/img/emotions/beer.png diff --git a/build/img/emotions/biggrin.png b/build/img/emotions/biggrin.png Binary files differnew file mode 100644 index 0000000..44e3d67 --- /dev/null +++ b/build/img/emotions/biggrin.png diff --git a/build/img/emotions/crysad.png b/build/img/emotions/crysad.png Binary files differnew file mode 100644 index 0000000..74d4c2d --- /dev/null +++ b/build/img/emotions/crysad.png diff --git a/build/img/emotions/dead.png b/build/img/emotions/dead.png Binary files differnew file mode 100644 index 0000000..7dc19f8 --- /dev/null +++ b/build/img/emotions/dead.png diff --git a/build/img/emotions/devil.png b/build/img/emotions/devil.png Binary files differnew file mode 100644 index 0000000..6fd9533 --- /dev/null +++ b/build/img/emotions/devil.png diff --git a/build/img/emotions/dontknow.png b/build/img/emotions/dontknow.png Binary files differnew file mode 100644 index 0000000..7f95f8f --- /dev/null +++ b/build/img/emotions/dontknow.png diff --git a/build/img/emotions/doubt.png b/build/img/emotions/doubt.png Binary files differnew file mode 100644 index 0000000..46ca83c --- /dev/null +++ b/build/img/emotions/doubt.png diff --git a/build/img/emotions/grin.png b/build/img/emotions/grin.png Binary files differnew file mode 100644 index 0000000..6206f66 --- /dev/null +++ b/build/img/emotions/grin.png diff --git a/build/img/emotions/kiss.png b/build/img/emotions/kiss.png Binary files differnew file mode 100644 index 0000000..ca292b1 --- /dev/null +++ b/build/img/emotions/kiss.png diff --git a/build/img/emotions/kissing.png b/build/img/emotions/kissing.png Binary files differnew file mode 100644 index 0000000..4cd401c --- /dev/null +++ b/build/img/emotions/kissing.png diff --git a/build/img/emotions/lol.png b/build/img/emotions/lol.png Binary files differnew file mode 100644 index 0000000..21eff88 --- /dev/null +++ b/build/img/emotions/lol.png diff --git a/build/img/emotions/love.png b/build/img/emotions/love.png Binary files differnew file mode 100644 index 0000000..a0738ab --- /dev/null +++ b/build/img/emotions/love.png diff --git a/build/img/emotions/music.png b/build/img/emotions/music.png Binary files differnew file mode 100644 index 0000000..9693d3d --- /dev/null +++ b/build/img/emotions/music.png diff --git a/build/img/emotions/nerv.png b/build/img/emotions/nerv.png Binary files differnew file mode 100644 index 0000000..3f8c97e --- /dev/null +++ b/build/img/emotions/nerv.png diff --git a/build/img/emotions/rose.png b/build/img/emotions/rose.png Binary files differnew file mode 100644 index 0000000..8f79602 --- /dev/null +++ b/build/img/emotions/rose.png diff --git a/build/img/emotions/sad.png b/build/img/emotions/sad.png Binary files differnew file mode 100644 index 0000000..96e1311 --- /dev/null +++ b/build/img/emotions/sad.png diff --git a/build/img/emotions/sick.png b/build/img/emotions/sick.png Binary files differnew file mode 100644 index 0000000..dc6bef2 --- /dev/null +++ b/build/img/emotions/sick.png diff --git a/build/img/emotions/smile.png b/build/img/emotions/smile.png Binary files differnew file mode 100644 index 0000000..c57c836 --- /dev/null +++ b/build/img/emotions/smile.png diff --git a/build/img/emotions/strange.png b/build/img/emotions/strange.png Binary files differnew file mode 100644 index 0000000..394a322 --- /dev/null +++ b/build/img/emotions/strange.png diff --git a/build/img/emotions/sunglassess.png b/build/img/emotions/sunglassess.png Binary files differnew file mode 100644 index 0000000..cc4df59 --- /dev/null +++ b/build/img/emotions/sunglassess.png diff --git a/build/img/emotions/surprised.png b/build/img/emotions/surprised.png Binary files differnew file mode 100644 index 0000000..28ab3b6 --- /dev/null +++ b/build/img/emotions/surprised.png diff --git a/build/img/emotions/thumbsup.png b/build/img/emotions/thumbsup.png Binary files differnew file mode 100644 index 0000000..0e3f1b4 --- /dev/null +++ b/build/img/emotions/thumbsup.png diff --git a/build/img/emotions/tired.png b/build/img/emotions/tired.png Binary files differnew file mode 100644 index 0000000..d229f4d --- /dev/null +++ b/build/img/emotions/tired.png diff --git a/build/img/emotions/tonguesmile.png b/build/img/emotions/tonguesmile.png Binary files differnew file mode 100644 index 0000000..cfd4ea1 --- /dev/null +++ b/build/img/emotions/tonguesmile.png diff --git a/build/img/emotions/weird.png b/build/img/emotions/weird.png Binary files differnew file mode 100644 index 0000000..4775a9d --- /dev/null +++ b/build/img/emotions/weird.png diff --git a/build/img/emotions/wink.png b/build/img/emotions/wink.png Binary files differnew file mode 100644 index 0000000..4f89797 --- /dev/null +++ b/build/img/emotions/wink.png diff --git a/build/img/emotions/xp.png b/build/img/emotions/xp.png Binary files differnew file mode 100644 index 0000000..e83ad50 --- /dev/null +++ b/build/img/emotions/xp.png diff --git a/build/img/emotions/yesyes.png b/build/img/emotions/yesyes.png Binary files differnew file mode 100644 index 0000000..dfb978e --- /dev/null +++ b/build/img/emotions/yesyes.png diff --git a/build/img/emotions/zip.png b/build/img/emotions/zip.png Binary files differnew file mode 100644 index 0000000..0994932 --- /dev/null +++ b/build/img/emotions/zip.png diff --git a/build/img/gear.svg b/build/img/gear.svg new file mode 100644 index 0000000..3044246 --- /dev/null +++ b/build/img/gear.svg @@ -0,0 +1,80 @@ +<?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="272.70593" + height="275.19449" + id="svg2" + version="1.1" + inkscape:version="0.48.3.1 r9886" + sodipodi:docname="gear.svg"> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.7" + inkscape:cx="159.11118" + inkscape:cy="75.475936" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1111" + inkscape:window-height="840" + inkscape:window-x="191" + inkscape:window-y="28" + inkscape:window-maximized="0" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" /> + <defs + id="defs4"> + <clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath4617"> + <path + sodipodi:type="arc" + style="fill:#b3b3b3;stroke:none" + id="path4619" + sodipodi:cx="141.42857" + sodipodi:cy="140.90877" + sodipodi:rx="124.28571" + sodipodi:ry="124.28571" + d="m 265.71429,140.90877 a 124.28571,124.28571 0 1 1 -248.57143,0 124.28571,124.28571 0 1 1 248.57143,0 z" + transform="translate(170.48656,275.14888)" /> + </clipPath> + </defs> + <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" /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-175.56216,-278.4604)"> + <path + style="fill:#b3b3b3;stroke:none" + d="m 322.90077,552.37609 c -0.8025,-1.03265 -4.1298,-6.77812 -7.394,-12.76771 -5.66062,-10.38686 -5.9349,-11.45971 -5.9349,-23.21429 0,-6.77827 -0.16071,-12.33471 -0.35714,-12.34764 -0.19643,-0.0129 -7.10714,-1.25351 -15.35714,-2.75686 -8.25,-1.50332 -15.42054,-2.29632 -15.93453,-1.7622 -0.51399,0.53413 -2.65068,5.852 -4.7482,11.8175 -3.29679,9.3763 -4.91271,11.81339 -11.92261,17.98135 -13.16776,11.58617 -12.78024,11.47418 -21.89865,6.32807 l -7.91867,-4.46902 2.59473,-13.70492 c 2.49374,-13.17148 2.90233,-14.05529 10.49705,-22.70579 4.34627,-4.95047 7.90231,-9.56676 7.90231,-10.2584 0,-1.47559 -18.31337,-23.80793 -20.06165,-24.4643 -0.65433,-0.24566 -6.31795,2.51133 -12.58583,6.12664 l -11.39614,6.57329 -13.13132,-0.41234 -13.13131,-0.41236 -3.2803,-8.73539 -3.28031,-8.7354 10.00696,-8.17517 c 10.84131,-8.85678 12.71635,-9.70148 27.21704,-12.26113 l 9.64286,-1.70214 0,-16.16553 0,-16.16553 -7.5,-1.47726 c -4.125,-0.81249 -9.8425,-1.8811 -12.70556,-2.37469 -3.46464,-0.5973 -8.76203,-3.85429 -15.83987,-9.73882 l -10.63432,-8.8414 3.17885,-8.52806 3.17886,-8.52805 13.60638,-0.40736 13.60637,-0.40735 10.9584,6.47878 c 6.02712,3.56333 11.38742,6.44805 11.91178,6.41048 1.07253,-0.0768 19.25751,-22.17096 20.00721,-24.30806 0.26531,-0.75631 -2.67819,-5.06316 -6.54112,-9.5708 -9.23405,-10.77518 -8.94789,-10.17209 -11.75184,-24.76724 l -2.43237,-12.66102 8.23066,-4.90297 8.23065,-4.90298 10.59272,9.07442 c 9.9688,8.53993 10.84458,9.77375 14.869,20.94783 2.78986,7.74624 4.97907,11.78706 6.2981,11.625 1.112,-0.13663 8.28967,-1.33754 15.95038,-2.66869 l 13.92857,-2.42028 0,-12.18641 c 0,-11.78521 0.21856,-12.59093 6.63887,-24.47416 3.65139,-6.75827 6.83678,-12.52672 7.07865,-12.81878 0.24187,-0.29206 4.61063,0.25596 9.70834,1.21783 10.34441,1.95186 9.29217,0.3446 12.39626,18.9345 1.53751,9.2079 1.41438,10.15238 -2.8655,21.98039 -2.45962,6.79749 -4.29177,12.48885 -4.07147,12.64746 4.71177,3.39226 27.103,15.17953 28.15202,14.81988 0.79829,-0.27369 4.84943,-4.58023 9.00255,-9.57008 6.9761,-8.38161 8.52263,-9.438 20.30933,-13.87272 l 12.75821,-4.80025 5.08923,5.87865 c 2.79907,3.23326 5.53904,6.62899 6.08881,7.54607 0.54977,0.91709 -2.04455,6.76442 -5.76518,12.99407 -6.19419,10.37126 -7.69156,11.86889 -17.75219,17.75522 -6.04307,3.53571 -11.0023,7.00724 -11.02051,7.71451 -0.0183,0.70726 2.31563,7.61798 5.18633,15.35714 3.61895,9.75638 5.91877,14.07069 7.5,14.06952 1.2543,-9.3e-4 6.9707,-0.89614 12.70311,-1.98936 10.42006,-1.9872 10.42577,-1.98654 23.57143,2.70176 l 13.14886,4.68944 0.41954,9.31679 0.41954,9.3168 -8.15887,3.05261 c -15.89207,5.94599 -18.87437,6.32689 -32.05681,4.0942 l -12.23376,-2.072 -5.26624,14.56129 c -2.89645,8.00871 -5.25595,15.12 -5.24333,15.80287 0.0128,0.68285 4.99475,3.99618 11.07143,7.36293 10.50011,5.81754 11.37924,6.70144 17.71197,17.80828 l 6.66347,11.68693 -2.7181,3.62029 c -1.49496,1.99115 -4.17209,5.33511 -5.94919,7.43102 l -3.23108,3.81075 -12.85165,-4.85782 c -10.57761,-3.99825 -13.73735,-5.93237 -17.85714,-10.93058 -2.75303,-3.34003 -6.61264,-7.82157 -8.57693,-9.959 l -3.57143,-3.88623 -13.57142,7.92583 c -7.46429,4.3592 -13.74919,8.09684 -13.96646,8.30585 -0.21727,0.20903 1.60376,5.7737 4.04673,12.36596 4.3249,11.67062 4.39808,12.26779 2.78221,22.70022 -2.66803,17.22532 -2.40288,16.70485 -9.04751,17.76102 -3.2768,0.52086 -7.29125,1.27903 -8.92097,1.68483 -1.62973,0.4058 -3.61975,-0.10714 -4.42225,-1.13973 l 0,0 z m 5.75622,-91.21091 c 40.6356,-15.20371 40.72047,-74.63235 0.12828,-89.86647 -11.6351,-4.36662 -28.19803,-3.77677 -38.37603,1.36669 -37.2726,18.83572 -35.50133,72.09244 2.92315,87.89042 10.85167,4.4616 24.40368,4.69537 35.32454,0.60936 l 6e-5,0 z" + id="path4584" + inkscape:connector-curvature="0" + clip-path="url(#clipPath4617)" /> + </g> +</svg> diff --git a/build/js/admin.js b/build/js/admin.js index 04fbe37..7aa450a 100644 --- a/build/js/admin.js +++ b/build/js/admin.js @@ -1,5 +1,5 @@ /** - * ojsxc v0.7.0 - 2014-03-07 + * ojsxc v0.7.1 - 2014-03-18 * * Copyright (c) 2014 Klaus Herberth <klaus@jsxc.org> <br> * Released under the MIT license @@ -7,7 +7,7 @@ * Please see http://jsxc.org/ * * @author Klaus Herberth <klaus@jsxc.org> - * @version 0.7.0 + * @version 0.7.1 */ $(document).ready(function() { diff --git a/build/js/eof.js b/build/js/eof.js index a76374f..bb1031b 100644 --- a/build/js/eof.js +++ b/build/js/eof.js @@ -1,5 +1,5 @@ /** - * ojsxc v0.7.0 - 2014-03-07 + * ojsxc v0.7.1 - 2014-03-18 * * Copyright (c) 2014 Klaus Herberth <klaus@jsxc.org> <br> * Released under the MIT license @@ -7,7 +7,7 @@ * Please see http://jsxc.org/ * * @author Klaus Herberth <klaus@jsxc.org> - * @version 0.7.0 + * @version 0.7.1 */ /** diff --git a/build/js/jsxc/jsxc.lib.js b/build/js/jsxc/jsxc.lib.js index 45f07e8..b093d41 100644 --- a/build/js/jsxc/jsxc.lib.js +++ b/build/js/jsxc/jsxc.lib.js @@ -1,5 +1,5 @@ /** - * jsxc v0.7.0 - 2014-03-07 + * jsxc v0.7.1 - 2014-03-18 * * Copyright (c) 2014 Klaus Herberth <klaus@jsxc.org> <br> * Released under the MIT license @@ -7,7 +7,7 @@ * Please see http://jsxc.org/ * * @author Klaus Herberth <klaus@jsxc.org> - * @version 0.7.0 + * @version 0.7.1 */ var jsxc; @@ -22,7 +22,7 @@ var jsxc; */ jsxc = { /** Version of jsxc */ - version: '0.7.0', + version: '0.7.1', /** True if i'm the master */ master: false, @@ -1983,7 +1983,7 @@ var jsxc; var chat = jsxc.storage.getUserItem('chat_' + cid) || []; var data = jsxc.storage.getUserItem('buddy_' + cid); var html_msg = msg; - var uid = jsxc.xmpp.conn.getUniqueId('msg'); + var uid = new Date().getTime() + ':msg'; if (chat.length > jsxc.options.numberOfMsg) { chat.pop(); @@ -2068,7 +2068,7 @@ var jsxc; var msgDiv = $("<div>"); msgDiv.addClass('jsxc_chatmessage jsxc_' + direction); msgDiv.attr('id', uid); - msgDiv.text(msg); + msgDiv.html(msg); if (received) { msgDiv.addClass('jsxc_received'); @@ -2247,7 +2247,7 @@ var jsxc; <div class="jsxc_avatar">☺</div>\ </div>\ <div id="jsxc_menu">\ - <span>⚙</span>\ + <span></span>\ <ul>\ <li class="jsxc_muteNotification">%%Mute%%</li>\ <li class="jsxc_addBuddy">%%Add_buddy%%</li>\ diff --git a/build/js/jsxc/jsxc.lib.webrtc.js b/build/js/jsxc/jsxc.lib.webrtc.js index 45834f2..bb5f74c 100644 --- a/build/js/jsxc/jsxc.lib.webrtc.js +++ b/build/js/jsxc/jsxc.lib.webrtc.js @@ -1,5 +1,5 @@ /** - * jsxc v0.7.0 - 2014-03-07 + * jsxc v0.7.1 - 2014-03-18 * * Copyright (c) 2014 Klaus Herberth <klaus@jsxc.org> <br> * Released under the MIT license @@ -7,7 +7,7 @@ * Please see http://jsxc.org/ * * @author Klaus Herberth <klaus@jsxc.org> - * @version 0.7.0 + * @version 0.7.1 */ /* jsxc, Strophe, SDPUtil, getUserMediaWithConstraints, setupRTC, jQuery */ diff --git a/build/js/ojsxc.js b/build/js/ojsxc.js index e16e463..2b0985f 100644 --- a/build/js/ojsxc.js +++ b/build/js/ojsxc.js @@ -1,5 +1,5 @@ /** - * ojsxc v0.7.0 - 2014-03-07 + * ojsxc v0.7.1 - 2014-03-18 * * Copyright (c) 2014 Klaus Herberth <klaus@jsxc.org> <br> * Released under the MIT license @@ -7,7 +7,7 @@ * Please see http://jsxc.org/ * * @author Klaus Herberth <klaus@jsxc.org> - * @version 0.7.0 + * @version 0.7.1 */ /* global jsxc, oc_appswebroots, OC, $, oc_requesttoken */ |
