Merge branch 'master' of github.com:matrix-org/synapse into develop

1 files changed, 0 insertions, 81 deletions

diff --git a/webclient/app.js b/webclient/app.js
index 576912be46..f27ebedc6f 100644
--- a/webclient/app.js
+++ b/webclient/app.js
@@ -83,84 +83,3 @@ matrixWebClient.run(['$location', 'matrixService', 'eventStreamService', functio
         eventStreamService.resume();
     }
 }]);
-
-matrixWebClient
-    .directive('ngEnter', function () {
-        return function (scope, element, attrs) {
-            element.bind("keydown keypress", function (event) {
-                if(event.which === 13) {
-                    scope.$apply(function () {
-                        scope.$eval(attrs.ngEnter);
-                    });
-                    event.preventDefault();
-                }
-            });
-        };
-    })
-    .directive('ngFocus', ['$timeout', function($timeout) {
-        return {
-            link: function(scope, element, attr) {
-                $timeout(function() { element[0].focus() }, 0);
-            }
-        };
-    }])
-    .filter('duration', function() {
-        return function(time) {
-            if (!time) return;
-            var t = parseInt(time / 1000);
-            var s = t % 60;
-            var m = parseInt(t / 60) % 60;
-            var h = parseInt(t / (60 * 60)) % 24;
-            var d = parseInt(t / (60 * 60 * 24));
-            if (t < 60) {
-                return s + "s"
-            }
-            if (t < 60 * 60) {
-                return m + "m "; //  + s + "s";
-            }
-            if (t < 24 * 60 * 60) {
-                return h + "h "; // + m + "m";
-            }
-            return d + "d "; // + h + "h";
-        }
-    })
-    .filter('orderMembersList', function($sce) {
-        return function(members) {
-            var filtered = [];
-            
-            var displayNames = {};
-            angular.forEach(members, function(value, key) {
-                value["id"] = key;
-                filtered.push( value );
-                if (value["displayname"]) {
-                    if (!displayNames[value["displayname"]]) {
-                        displayNames[value["displayname"]] = [];
-                    }
-                    displayNames[value["displayname"]].push(key);
-                }
-            });
-
-            // FIXME: we shouldn't disambiguate displayNames on every orderMembersList
-            // invocation but keep track of duplicates incrementally somewhere            
-            angular.forEach(displayNames, function(value, key) {
-                if (value.length > 1) {
-                    // console.log(key + ": " + value);
-                    for (i=0; i < value.length; i++) {
-                        var v = value[i];
-                        members[v].displayname += " (" + v + ")";
-                        // console.log(v + " " + members[v]);
-                    };
-                }
-            });
-            
-            filtered.sort(function (a, b) {
-                return ((a["mtime_age"] || 10e10) > (b["mtime_age"] || 10e10) ? 1 : -1);
-            });
-            return filtered;
-        };
-    })
-    .filter('unsafe', ['$sce', function($sce) {
-        return function(text) {
-            return $sce.trustAsHtml(text);
-        };
-    }]);