build v0.8.2

add translation
update example
2014-08-20 12:05:34 +02:00 · 2014-08-20 12:01:49 +02:00 · 2014-08-19 13:39:39 +02:00 · 2014-08-19 13:39:03 +02:00 · 2014-08-19 12:54:53 +02:00 · 2014-08-19 12:48:48 +02:00
@@ -1,3 +1,10 @@
+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
@@ -46,6 +46,32 @@ module.exports = function(grunt) {
               to: "<%= app.version %>"
            } ]
         }
+      },
+      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.");
+                  }
+               }
+            }
+         }
      }
   });

@@ -55,8 +81,9 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-banner');
   grunt.loadNpmTasks('grunt-text-replace');
+   grunt.loadNpmTasks('grunt-search');

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

 };
@@ -1,5 +1,5 @@
 /**
- * jsxc v0.8.1 - 2014-08-12
+ * jsxc v0.8.2 - 2014-08-20
 * 
 * Copyright (c) 2014 Klaus Herberth <klaus@jsxc.org> <br>
 * Released under the MIT license
@@ -7,7 +7,7 @@
 * Please see http://www.jsxc.org/
 * 
 * @author Klaus Herberth <klaus@jsxc.org>
- * @version 0.8.1
+ * @version 0.8.2
 */

 var jsxc;
@@ -22,7 +22,7 @@ var jsxc;
    */
   jsxc = {
      /** Version of jsxc */
-      version: '0.8.1',
+      version: '0.8.2',

      /** True if i'm the master */
      master: false,
@@ -108,7 +108,9 @@ var jsxc;
         }

         if (data) {
-            console.log(msg, data);
+            if (jsxc.storage.getItem('debug') === true) {
+               console.log(msg, data);
+            }

            // try to convert data to string
            var d;
@@ -285,6 +287,10 @@ var jsxc;
                  return true;
               }

+               if (typeof settings.xmpp.username === 'string') {
+                  username = settings.xmpp.username;
+               }
+
               var resource = (settings.xmpp.resource) ? '/' + settings.xmpp.resource : '';
               var domain = settings.xmpp.domain;
               var jid;
@@ -312,7 +318,7 @@ var jsxc;
               jsxc.options.xmpp.jid = jid;
               jsxc.options.xmpp.password = password;

-               if (settings.xmpp.onlogin === "true") {
+               if (settings.xmpp.onlogin === "true" || settings.xmpp.onlogin === true) {
                  jsxc.triggeredFromForm = true;

                  jsxc.xmpp.login();
@@ -1451,7 +1457,7 @@ var jsxc;
      showSettings: function() {
         jsxc.gui.dialog.open(jsxc.gui.template.get('settings'));

-         if (jsxc.options.get('xmpp').overwrite === 'false') {
+         if (jsxc.options.get('xmpp').overwrite === 'false' || jsxc.options.get('xmpp').overwrite === false) {
            $('.jsxc_fieldsetXmpp').hide();
         }

@@ -2766,10 +2772,6 @@ var jsxc;
            };
         }

-         // Strophe.log = function(level, msg) {
-         // console.log(level + " " + msg);
-         // };
-
         var callback = function(status, condition) {

            jsxc.debug(Object.getOwnPropertyNames(Strophe.Status)[status] + ': ' + condition);
@@ -4809,7 +4811,12 @@ var jsxc;
         A_fingerprint_: 'A fingerprint is used to make sure that the person you are talking to is who he or she is saying.',
         Your_roster_is_empty_add_a: 'Your roster is empty, add a ',
         new_buddy: 'new buddy',
-         is: 'is'
+         is: 'is',
+         Login_options: 'Login options',
+         BOSH_url: 'BOSH url',
+         Domain: 'Domain',
+         Resource: 'Resource',
+         On_login: 'On login'
      },
      de: {
         please_wait_until_we_logged_you_in: 'Bitte warte bis wir dich eingeloggt haben.',
@@ -4945,7 +4952,14 @@ var jsxc;
         Save: 'Speichern',
         User_settings: 'Benutzereinstellungen',
         A_fingerprint_: 'Ein Fingerabdruck wird dazu benutzt deinen Gesprächspartner zu identifizieren.',
-         is: 'ist'
+         Your_roster_is_empty_add_a: 'Deine Freundesliste ist leer, füge einen neuen Freund ',
+         new_buddy: 'hinzu',
+         is: 'ist',
+         Login_options: 'Anmeldeoptionen',
+         BOSH_url: 'BOSH url',
+         Domain: 'Domain',
+         Resource: 'Ressource',
+         On_login: 'Beim Anmelden'
      },
      es: {
         please_wait_until_we_logged_you_in: 'Por favor, espere...',
@@ -5079,7 +5093,12 @@ var jsxc;
         A_fingerprint_: 'La huella digital se utiliza para que puedas estar seguro que la persona con la que estas hablando es quien realmente dice ser',
         Your_roster_is_empty_add_a: 'Tu lista de amigos esta vacia',
         new_buddy: 'Nuevo amigo',
-         is: 'es'
+         is: 'es',
+         Login_options: 'Opciones de login',
+         BOSH_url: 'BOSH url',
+         Domain: 'Dominio',
+         Resource: 'Recurso',
+         On_login: 'Iniciar sesión'
      }
   };
 }(jQuery));
@@ -1,5 +1,5 @@
 /**
- * jsxc v0.8.1 - 2014-08-12
+ * jsxc v0.8.2 - 2014-08-20
 * 
 * Copyright (c) 2014 Klaus Herberth <klaus@jsxc.org> <br>
 * Released under the MIT license
@@ -7,7 +7,7 @@
 * Please see http://www.jsxc.org/
 * 
 * @author Klaus Herberth <klaus@jsxc.org>
- * @version 0.8.1
+ * @version 0.8.2
 */

 /* jsxc, Strophe, SDPUtil, getUserMediaWithConstraints, setupRTC, jQuery */
@@ -185,7 +185,7 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
      onAddRosterItem: function(event, cid, data, el) {
         var self = jsxc.webrtc;
         var videoIcon = $('<div class="jsxc_video jsxc_disabled" title="' + jsxc.l.Start_video_call + '"></div>');
-console.log(data);
+
         videoIcon.click(function() {
            self.startCall(data.jid);
            return false;
@@ -3,30 +3,12 @@ $(function() {
      loginForm: {
         form: '#form',
         jid: '#username',
-         pass: '#password',
-         preJid: function(jid) {
-            var data = {
-               xmppResource: 'example',
-               xmppDomain: 'localhost',
-               boshUrl: '/http-bind/'
-            };
-
-            var resource = (data.xmppResource) ? '/' + data.xmppResource : '';
-            var domain = data.xmppDomain;
-
-            jsxc.storage.setItem('boshUrl', data.boshUrl);
-
-            if (jid.match(/@(.*)$/)) {
-               return (jid.match(/\/(.*)$/)) ? jid : jid + resource;
-            }
-
-            return jid + '@' + domain + resource;
-         }
+         pass: '#password'
      },
      logoutElement: $('#logout'),
      checkFlash: false,
      rosterAppend: 'body',
-      root: '../',
+      root: '/jsxc/',
      turnCredentialsPath: 'ajax/getturncredentials.json',
      displayRosterMinimized: function() {
         return true;
@@ -36,6 +18,16 @@ $(function() {
         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
+            }
+         };
+      }
   });
 });
@@ -96,7 +96,9 @@ var jsxc;
         }

         if (data) {
-            console.log(msg, data);
+            if (jsxc.storage.getItem('debug') === true) {
+               console.log(msg, data);
+            }

            // try to convert data to string
            var d;
@@ -273,6 +275,10 @@ var jsxc;
                  return true;
               }

+               if (typeof settings.xmpp.username === 'string') {
+                  username = settings.xmpp.username;
+               }
+
               var resource = (settings.xmpp.resource) ? '/' + settings.xmpp.resource : '';
               var domain = settings.xmpp.domain;
               var jid;
@@ -300,7 +306,7 @@ var jsxc;
               jsxc.options.xmpp.jid = jid;
               jsxc.options.xmpp.password = password;

-               if (settings.xmpp.onlogin === "true") {
+               if (settings.xmpp.onlogin === "true" || settings.xmpp.onlogin === true) {
                  jsxc.triggeredFromForm = true;

                  jsxc.xmpp.login();
@@ -1439,7 +1445,7 @@ var jsxc;
      showSettings: function() {
         jsxc.gui.dialog.open(jsxc.gui.template.get('settings'));

-         if (jsxc.options.get('xmpp').overwrite === 'false') {
+         if (jsxc.options.get('xmpp').overwrite === 'false' || jsxc.options.get('xmpp').overwrite === false) {
            $('.jsxc_fieldsetXmpp').hide();
         }

@@ -2754,10 +2760,6 @@ var jsxc;
            };
         }

-         // Strophe.log = function(level, msg) {
-         // console.log(level + " " + msg);
-         // };
-
         var callback = function(status, condition) {

            jsxc.debug(Object.getOwnPropertyNames(Strophe.Status)[status] + ': ' + condition);
@@ -4797,7 +4799,12 @@ var jsxc;
         A_fingerprint_: 'A fingerprint is used to make sure that the person you are talking to is who he or she is saying.',
         Your_roster_is_empty_add_a: 'Your roster is empty, add a ',
         new_buddy: 'new buddy',
-         is: 'is'
+         is: 'is',
+         Login_options: 'Login options',
+         BOSH_url: 'BOSH url',
+         Domain: 'Domain',
+         Resource: 'Resource',
+         On_login: 'On login'
      },
      de: {
         please_wait_until_we_logged_you_in: 'Bitte warte bis wir dich eingeloggt haben.',
@@ -4933,7 +4940,14 @@ var jsxc;
         Save: 'Speichern',
         User_settings: 'Benutzereinstellungen',
         A_fingerprint_: 'Ein Fingerabdruck wird dazu benutzt deinen Gesprächspartner zu identifizieren.',
-         is: 'ist'
+         Your_roster_is_empty_add_a: 'Deine Freundesliste ist leer, füge einen neuen Freund ',
+         new_buddy: 'hinzu',
+         is: 'ist',
+         Login_options: 'Anmeldeoptionen',
+         BOSH_url: 'BOSH url',
+         Domain: 'Domain',
+         Resource: 'Ressource',
+         On_login: 'Beim Anmelden'
      },
      es: {
         please_wait_until_we_logged_you_in: 'Por favor, espere...',
@@ -5067,7 +5081,12 @@ var jsxc;
         A_fingerprint_: 'La huella digital se utiliza para que puedas estar seguro que la persona con la que estas hablando es quien realmente dice ser',
         Your_roster_is_empty_add_a: 'Tu lista de amigos esta vacia',
         new_buddy: 'Nuevo amigo',
-         is: 'es'
+         is: 'es',
+         Login_options: 'Opciones de login',
+         BOSH_url: 'BOSH url',
+         Domain: 'Dominio',
+         Resource: 'Recurso',
+         On_login: 'Iniciar sesión'
      }
   };
 }(jQuery));
@@ -173,7 +173,7 @@ jsxc.gui.template.videoWindow = '<div class="jsxc_webrtc">\
      onAddRosterItem: function(event, cid, data, el) {
         var self = jsxc.webrtc;
         var videoIcon = $('<div class="jsxc_video jsxc_disabled" title="' + jsxc.l.Start_video_call + '"></div>');
-console.log(data);
+
         videoIcon.click(function() {
            self.startCall(data.jid);
            return false;
@@ -142,22 +142,39 @@
 }

 #cboxClose {
-	position: absolute;
-	top: 5px;
-	right: 5px;
-	display: block;
-	background: url(%webroot%/core/img/actions/close.svg) no-repeat right
-		center !important;
-	opacity: 0.5;
-	width: 19px !important;
-	height: 19px;
-	border: 0px;
-	text-indent: -9999px;
+   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;
+   background-position: right center !important;
+   opacity: 1.0;
 }

 /*
@@ -1,22 +1,23 @@
 {
-   "name": "jsxc",
-   "version": "0.8.1",
-   "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": "0.8.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-banner": "~0.2.2",
+    "grunt-cli": "~0.1.13",
+    "grunt-contrib-clean": "~0.5.0",
+    "grunt-contrib-copy": "~0.5.0",
+    "grunt-contrib-jshint": "~0.9.2",
+    "grunt-search": "^0.1.6",
+    "grunt-text-replace": "~0.3.11"
+  }
 }
Autor	SHA1	Mensagem	Data
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