Merge pull request #1368 from arkascha/master

Version 0.2.4: Handling rules for the media app (aka 'music') fixing sliding the main content.

6 files changed, 36 insertions, 29 deletions

diff --git a/fluxx_compensator/appinfo/info.xml b/fluxx_compensator/appinfo/info.xml
index 0a964b05a..f3f26ae4d 100644
--- a/fluxx_compensator/appinfo/info.xml
+++ b/fluxx_compensator/appinfo/info.xml
@@ -40,7 +40,7 @@
 		Simply click the handler to hide/show the navigation panel. To move the handler to where you want it to be, just hold the handler and drag it.
 		The older amongst us will know where the name 'FluXX Compensator (Y)' comes from... ;-)
 	</description>
-	<version>0.2.3</version>
+	<version>0.2.4</version>
 	<licence>AGPL</licence>
 	<author>Christian Reiner</author>
 	<require>4.93</require>
diff --git a/fluxx_compensator/appinfo/version b/fluxx_compensator/appinfo/version
index 373f8c6f0..abd410582 100644
--- a/fluxx_compensator/appinfo/version
+++ b/fluxx_compensator/appinfo/version
@@ -1 +1 @@
-0.2.3
\ No newline at end of file
+0.2.4
diff --git a/fluxx_compensator/css/dynamic.css b/fluxx_compensator/css/dynamic.css
index 62c962fce..cb3c58f06 100644
--- a/fluxx_compensator/css/dynamic.css
+++ b/fluxx_compensator/css/dynamic.css
@@ -99,6 +99,9 @@ html.fluxx-mode-gallery { }
 
 /* 'media' app */
 html.fluxx-mode-media { }
+html.fluxx-mode-media.fluxx-state-N-hidden #rightcontent { left: -64px; }
+html.fluxx-mode-media.fluxx-state-H-hidden #rightcontent { top: -3.5em; }
+
 
 /* 'notes' app */
 html.fluxx-mode-notes { }
diff --git a/fluxx_compensator/css/transitions.css b/fluxx_compensator/css/transitions.css
index d16d2efc6..bbd09c4af 100644
--- a/fluxx_compensator/css/transitions.css
+++ b/fluxx_compensator/css/transitions.css
@@ -63,7 +63,9 @@ html.fluxx-mode-gallery { }
 
 /* 'media' app */
 html.fluxx-mode-media { }
-
+html.fluxx-mode-media #rightcontent {
+  transition:all 300ms;-o-transition:all 300ms;-ms-transition:all 300ms;-moz-transition:all 300ms;-khtml-transition:all 300ms;-webkit-transition:all 300ms;
+}
 /* 'notes' app */
 html.fluxx-mode-notes { }
 
diff --git a/fluxx_compensator/doc/CHANGELOG b/fluxx_compensator/doc/CHANGELOG
index dec5fad19..e3f9ecc1b 100644
--- a/fluxx_compensator/doc/CHANGELOG
+++ b/fluxx_compensator/doc/CHANGELOG
@@ -21,29 +21,31 @@
 * If not, see <http://www.gnu.org/licenses/>.
 *****
 
-Changelog: 
+Changelog:
 
+* Wed Sep 11 2013 Christian Reiner: version 0.2.4
+Handling rules for the media app (aka 'music') fixing sliding the main content.
 * Sun Aug 04 2013 Christian Reiner: version 0.2.3
-FIxed layout in contacts app mode by an additional app specific css rule. 
+Fixed layout in contacts app mode by an additional app specific css rule.
 * Fri Jul 12 2013 Christian Reiner: version 0.2.2
-Prevent scrolling of fluxx handles. 
+Prevent scrolling of fluxx handles.
 * Sun Jun 16 2013 Christian Reiner: version 0.2.1
 A few style fixes to improve optics when used inside MS-IE.
 * Thu Jun 13 2013 Christian Reiner: version 0.2.0
-Changed strategy for for fluxx handles, ugly but less cross browser problems. 
-Some style rules defaults now set explicitly to enable transitions in forefox. 
-Much enhanced cross browser compatibility, only some optical issue with IE left. 
+Changed strategy for for fluxx handles, ugly but less cross browser problems.
+Some style rules defaults now set explicitly to enable transitions in forefox.
+Much enhanced cross browser compatibility, only some optical issue with IE left.
 * Sun Apr 28 2013 Christian Reiner: version 0.1.4
 Include navigation handle in moving of content when header panel is hidden.
 Apply intelligent positioning to navigation handle when header is hidden too.
 Fixed a few glitches in handle movements under certain conditions.
 * Wed Apr 17 2013 Christian Reiner: version 0.1.3
-Some optical fixes to the handles position and shadow. 
-Slide navigations content up too when the header panel is hidden. 
+Some optical fixes to the handles position and shadow.
+Slide navigations content up too when the header panel is hidden.
 * Mon Apr 09 2013 Christian Reiner: version 0.1.2
 Fixed handle positioning for non-priviledged user accounts.
 * Sat Mar 23 2013 Christian Reiner: version 0.1.1
-Corrected handles anchor definition to work correct on exotic page layouts. 
-This is required by the 'external' app which embeds a frame as main widgets. 
+Corrected handles anchor definition to work correct on exotic page layouts.
+This is required by the 'external' app which embeds a frame as main widgets.
 * Tue Feb 19 2013 Christian Reiner: version 0.1.0
 Initial release.
diff --git a/fluxx_compensator/js/fluxx.js b/fluxx_compensator/js/fluxx.js
index 9896f7f45..5ae1b0507 100644
--- a/fluxx_compensator/js/fluxx.js
+++ b/fluxx_compensator/js/fluxx.js
@@ -134,10 +134,10 @@ OC.FluXX={
   /**
   * @method OC.FluXX.defaults
   * @brief Injects a few default style rules
-  * @description 
+  * @description
   * Firefox only animates transitions when the start style is explicitly set!
   * Instead of writing static rules we fetch those default rule settings from the live document
-  * This way things should be more robust against changes in the OC layout 
+  * This way things should be more robust against changes in the OC layout
   * @author Christian Reiner
   */
   defaults: function(){
@@ -279,24 +279,24 @@ OC.FluXX={
 	/**
 	* @method OC.FluXX.mode
 	* @brief Set global app mode
-	* @description 
-	* Depending on the active app the global html root element is marked with a css class. 
-	* That class controls any actions or compensations that might be required by that apps page layout. 
-	* This way all changes and animations can later be done purely in css, as opposed to js. 
+	* @description
+	* Depending on the active app the global html root element is marked with a css class.
+	* That class controls any actions or compensations that might be required by that apps page layout.
+	* This way all changes and animations can later be done purely in css, as opposed to js.
 	* @author Christian Reiner
 	*/
 	mode:function(){
 		// mark mode and active app as class of the html tag
 		// this acts like a 'switch' command inside the dynamically loaded css
 		var mode={
-			bookmarks_index:	'bookmarks',
-			files_index:		'files',
-			notes_index:		'notes',
-			media_index:		'media',
-			calendar_index:		'calendar',
-			contacts_index:		'contacts',
-			gallery_index:		'gallery',
-			shorty_index:		'shorty'
+			bookmarks_index: 'bookmarks',
+			files_index:     'files',
+			notes_index:     'notes',
+			media_index:     'media',
+			calendar_index:  'calendar',
+			contacts_index:  'contacts',
+			gallery_index:   'gallery',
+			shorty_index:    'shorty'
 		};
 		var index=$('body nav #navigation #apps').find('li .active').parents('li').attr('data-id');
 		// mark current mode (active app) as class of the html element
@@ -335,8 +335,8 @@ OC.FluXX={
 		$(document).on('mousemove',function(event){
 			var delta;
 			if (OC.FluXX.C_HORIZONTAL==handle.Orientation){
-				// we have to correct the raw vertical mouse position by two factors: 
-				// 1. half the handles size, 
+				// we have to correct the raw vertical mouse position by two factors:
+				// 1. half the handles size,
 				// 2. the start position of the anchor which is changed by the other handle and
 				delta=$(handle.Selector).height()/2.0;	// correction by half the handles size
 				OC.FluXX.position(handle, event.pageY-delta-handle.Position.Margin);