rebased on master and add minor fix for tizen port

CHANGES.rst

@@ -1,3 +1,9 @@
+Changes in Matrix Angular SDK 0.6.8 (2016-02-10)
+================================================
+
+Bug fixes:
+ - Fix display of HTML bodies (SYWEB-361)
+
 Changes in Matrix Angular SDK 0.6.7 (2015-09-09)
 ================================================
 

README.rst

@@ -1,6 +1,15 @@
 Matrix Angular SDK 
 ==================
 
+.. DANGER::
+   **matrix-angular-sdk is not currently being maintained or developed by the core
+   team, and whilst stable it has some serious performance issues; Angular makes it
+   a bit too easy to shoot yourself in the foot and doesn't help you escape when
+   you do so.  All of our current focus is going into the
+   https://github.com/matrix-org/matrix-js-sdk, https://github.com/matrix-org/matrix-react-sdk
+   and https://github.com/matrix-org/matrix-react-skin stack instead - please use
+   those rather than this if you want support from the core team.  Thanks!**
+
 .. image:: http://matrix.org/jenkins/buildStatus/icon?job=SynapseWebClient
    :target: http://matrix.org/jenkins/job/SynapseWebClient/
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "matrix-angular-sdk",
-  "version": "0.6.7,
+  "version": "0.6.8",
   "description": "AngularJS SDK and example front-end client for the Matrix.org decentralised communications platform",
   "main": "index.js",
   "scripts": {
@@ -24,7 +24,7 @@
     "iot"
   ],
   "author": "Matrix.org",
-  "license": "Apache 2.0",
+  "license": "Apache-2.0",
   "bugs": {
     "url": "https://matrix.org/jira/browse/SYWEB"
   },

syweb/webclient/VERSION

@@ -1 +1 @@
-0.6.7
+0.6.8

syweb/webclient/app/app.css

@@ -1014,7 +1014,6 @@ input.error {
 
 .pushsection {
     transition: max-height linear 0.5s, opacity linear 0.5s;
-    max-height: 1500px;
     overflow: hidden;
 }
 

syweb/webclient/app/login/login-controller.js

@@ -22,10 +22,19 @@ angular.module('LoginController', ['matrixService'])
 
     // Assume that this is hosted on the home server, in which case the URL
     // contains the home server.
-    var hs_url = $location.protocol() + "://" + $location.host();
+    var location_protocol = $location.protocol();
+    var location_host = $location.host();
+    var id_host = "matrix.org"
+    var id_url = $location.protocol() + "://" + id_host;
+    if (location_protocol === "file") {
+        location_protocol = "https";
+        location_host = id_host;
+	    id_url = location_protocol + "://" + location_host;
+    }
+    var hs_url = location_protocol + "://" + location_host;
     if ($location.port() &&
-        !($location.protocol() === "http" && $location.port() === 80) &&
-        !($location.protocol() === "https" && $location.port() === 443))
+        !(location_protocol === "http" && $location.port() === 80) &&
+        !(location_protocol=== "https" && $location.port() === 443))
     {
         hs_url += ":" + $location.port();
     }
@@ -35,7 +44,7 @@ angular.module('LoginController', ['matrixService'])
         desired_user_name: "",
         user_id: "",
         password: "",
-        identityServer: $location.protocol() + "://matrix.org",
+        identityServer: id_url,
         pwd1: "",
         pwd2: "",
     };

syweb/webclient/app/login/register-controller.js

@@ -23,10 +23,19 @@ angular.module('RegisterController', ['matrixService'])
 
     // Assume that this is hosted on the home server, in which case the URL
     // contains the home server.
-    var hs_url = $location.protocol() + "://" + $location.host();
+    var location_protocol = $location.protocol();
+    var location_host = $location.host();
+    var id_host = "matrix.org"
+    var id_url = $location.protocol() + "://" + id_host;
+    if (location_protocol === "file") {
+        location_protocol = "https";
+        location_host = id_host;
+	    id_url = location_protocol + "://" + location_host;
+    }
+    var hs_url = location_protocol + "://" + location_host;
     if ($location.port() &&
-        !($location.protocol() === "http" && $location.port() === 80) &&
-        !($location.protocol() === "https" && $location.port() === 443))
+        !(location_protocol === "http" && $location.port() === 80) &&
+        !(location_protocol=== "https" && $location.port() === 443))
     {
         hs_url += ":" + $location.port();
     }
@@ -51,7 +60,7 @@ angular.module('RegisterController', ['matrixService'])
         desired_user_id: "",
         desired_user_name: "",
         password: "",
-        identityServer: $location.protocol() + "://matrix.org",
+        identityServer: id_url,
         pwd1: "",
         pwd2: "",
         displayName : "",

syweb/webclient/app/room/room.html

@@ -230,12 +230,12 @@
                                   class="message"
                                   fix-width="false && msg.e.user_id === state.user_id" 
                                   ng-class="shouldHighlightEvent(msg.event) && msg.e.user_id != state.user_id ? msg.css_class + ' messageBing' : msg.css_class"
-                                  ng-bind-html="(msg.e.content.format === 'org.matrix.custom.html') ? (msg.e.content.formatted_body | unsanitizedLinky:'_blank') : (msg.e.content.body | escapeHTML | unsanitizedLinky:'_blank') "/>
+                                  ng-bind-html="(msg.e.content.format === 'org.matrix.custom.html') ? (msg.e.content.formatted_body) : (msg.e.content.body | escapeHTML | unsanitizedLinky:'_blank') "/>
                             <span ng-switch-when="m.notice"
                                   class="message messageNotice"
                                   fix-width="false && msg.e.user_id === state.user_id" 
                                   ng-class="shouldHighlightEvent(msg.event) && msg.e.user_id != state.user_id ? msg.css_class + ' messageBing' : msg.css_class"
-                                  ng-bind-html="(msg.e.content.format === 'org.matrix.custom.html') ? (msg.e.content.formatted_body | unsanitizedLinky:'_blank') : (msg.e.content.body | escapeHTML | unsanitizedLinky:'_blank') "/>
+                                  ng-bind-html="(msg.e.content.format === 'org.matrix.custom.html') ? (msg.e.content.formatted_body) : (msg.e.content.body | escapeHTML | unsanitizedLinky:'_blank') "/>
                             <div ng-switch-when="m.image" style="position: relative;">
                                 <div ng-hide='msg.e.content.thumbnail_url || msg.e.content.url.indexOf("mxc://") === 0' ng-style="msg.e.content.body.h && { 'height' : (msg.e.content.body.h < 320) ? msg.e.content.body.h : 320}">
                                     <img class="image" ng-src="{{ msg.httpUri(msg.e.content.url, 320, 320) }}"/>