Merge branch 'master' of https://github.com/friendica/red

boot.php

@@ -84,7 +84,8 @@ $DIRECTORY_FALLBACK_SERVERS = array(
 	'https://red.zottel.red',
 	'https://red.pixelbits.de',
 	'https://my.federated.social',
-	'https://whogotzot.com'
+	'https://whogotzot.com',
+	'https://redmatrix.nl'
 );
 
 

doc/roadmap.bb

@@ -2,6 +2,9 @@
 
 Roadmap for Redmatrix V3
 
+Crypto
+	Convert E2EE to dynamic loading (on demand) using jQuery.getScript() [or other methods] to only load encryption libs when you require them. This should also support multiple encryption libraries (e.g. SJCL, others) triggered from the choice of algorithm and remain pluggable.
+ 
 
 Subscriptions and business models
 	Build enough into core(/addons) to generate income (or at least try and cover costs) out of the box

library/jRange/jquery.range.css

@@ -19,6 +19,9 @@
   opacity: 1;
   z-index: 2;
 }
+.slider-container .back-bar .pointer.last-active {
+  z-index: 3;
+}
 .slider-container .back-bar .pointer-label {
   position: absolute;
   top: -17px;

library/jRange/jquery.range.js

@@ -33,7 +33,9 @@
 			step  : 1,
 			format: '%s',
 			theme : 'theme-green',
-			width : 300
+			width : 300,
+			minRange: 0,
+			maxRange: 'auto'
 		},
 		template : '<div class="slider-container">\
 			<div class="back-bar">\
@@ -103,7 +105,8 @@
 			if(e.which !== 1){return;}
 			e.stopPropagation(); e.preventDefault();
 			var pointer = $(e.target);
-			pointer.addClass('focused');
+			this.pointers.removeClass('last-active');
+			pointer.addClass('focused last-active');
 			this[(pointer.hasClass('low')?'low':'high') + 'Label'].addClass('focused');
 			$(document).on('mousemove.slider', $.proxy(this.onDrag, this, pointer));
 			$(document).on('mouseup.slider', $.proxy(this.onDragEnd, this));
@@ -280,6 +283,7 @@
 				options = typeof option === 'object' && option;
 			if (!data) {
 				$this.data('plugin_' + pluginName, (data = new jRange(this, options)));
+				$(window).resize(function() { data.setValue(data.getValue()); }); // Update slider position when window is resized to keep it in sync with scale
 			}
 			// if first argument is a string, call silimarly named function
 			// this gives flexibility to call functions of the plugin e.g.
@@ -294,4 +298,4 @@
 		return result || this;
 	};
 
-})(jQuery, window, document);
+})(jQuery, window, document);

library/jRange/jquery.range.less

@@ -73,6 +73,9 @@
             cursor: move;
             opacity: 1;
             z-index: 2;
+            &.last-active{
+                z-index: 3;
+            }
         }
         .pointer-label {
             position: absolute;

library/jquery-textcomplete/jquery.textcomplete.js

@@ -124,9 +124,8 @@ if (typeof jQuery === 'undefined') {
     this.views      = [];
     this.option     = $.extend({}, Completer._getDefaults(), option);
 
-
     if (!this.$el.is('input[type=text]') && !this.$el.is('textarea') && !element.isContentEditable && element.contentEditable != 'true') {
-      throw new Error('textcomplete must be called on a input[type=text], Textarea or a ContentEditable.');
+      throw new Error('textcomplete must be called on a Textarea or a ContentEditable.');
     }
 
     if (element === document.activeElement) {
@@ -414,6 +413,22 @@ if (typeof jQuery === 'undefined') {
 
     setPosition: function (position) {
       this.$el.css(this._applyPlacement(position));
+
+      // Make the dropdown fixed if the input is also fixed
+      // This can't be done during init, as textcomplete may be used on multiple elements on the same page
+      // Because the same dropdown is reused behind the scenes, we need to recheck every time the dropdown is showed
+      var position = 'absolute';
+      // Check if input or one of its parents has positioning we need to care about
+      this.$inputEl.add(this.$inputEl.parents()).each(function() { 
+        if($(this).css('position') === 'absolute') // The element has absolute positioning, so it's all OK
+          return false;
+        if($(this).css('position') === 'fixed') {
+          position = 'fixed';
+          return false;
+        }
+      });
+      this.$el.css({ position: position }); // Update positioning
+
       return this;
     },
 

version.inc

@@ -1 +1 @@
-2015-01-20.922
+2015-01-21.923