This repository was archived by the owner on Sep 8, 2020. It is now read-only.

Adding RTL support#169

Open
widmoser wants to merge 4 commits into
base:master
Choose a base branch
from
Open

Adding RTL support #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d48e18
refactor(rtlSupport): removed depencency of container position on flo…
widmoser Dec 9, 2015
14b1425
feat(rtlSupport): adjusting flowProperty according to ui layout's dir…
widmoser Dec 9, 2015
53741f8
feat(rtlSupport): fixed mouse move calculations for rtl layouts
widmoser Dec 9, 2015
e71c419
test: added tests for rtl direction
widmoser Feb 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 40 additions & 28 deletions src/ui-layout.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,14 @@ angular.module('ui.layout', [])
mouseProperty: 'clientX',
flowPropertyPosition: 'x' };

$scope.$watch($window.getComputedStyle($element[0], null).direction, function() {
ctrl.dir = $window.getComputedStyle($element[0], null).direction;
if (ctrl.isUsingColumnFlow) {
ctrl.sizeProperties.flowProperty = ctrl.sizeProperties.offsetPos = (ctrl.dir === 'rtl') ? 'right' : 'left';
ctrl.calculate();
}
});

$element
// Force the layout to fill the parent space
// fix no height layout...
Expand DownExpand Up@@ -67,7 +75,6 @@ angular.module('ui.layout', [])

var debounceEvent;
function draw() {
var position = ctrl.sizeProperties.flowProperty;
var dividerSize = parseInt(opts.dividerSize);
var elementSize = $element[0][ctrl.sizeProperties.offsetSize];

Expand All@@ -82,8 +89,8 @@ angular.module('ui.layout', [])

if(!beforeContainer.collapsed && !afterContainer.collapsed) {
// calculate container positons
var difference = ctrl.movingSplitbar[position] - lastPos;
var newPosition = ctrl.movingSplitbar[position] - difference;
var difference = ctrl.movingSplitbar.position - lastPos;
var newPosition = ctrl.movingSplitbar.position - difference;

// Keep the bar in the window (no left/top 100%)
newPosition = Math.min(elementSize-dividerSize, newPosition);
Expand All@@ -103,16 +110,16 @@ angular.module('ui.layout', [])
newPosition = afterContainer.afterMaxValue;

// resize the before container
beforeContainer.size = newPosition - beforeContainer[position];
beforeContainer.size = newPosition - beforeContainer.position;
// store the current value to preserve this size during onResize
beforeContainer.uncollapsedSize = beforeContainer.size;

// update after container position
var oldAfterContainerPosition = afterContainer[position];
afterContainer[position] = newPosition + dividerSize;
var oldAfterContainerPosition = afterContainer.position;
afterContainer.position = newPosition + dividerSize;

//update after container size if the position has changed
if(afterContainer[position] != oldAfterContainerPosition) {
if(afterContainer.position != oldAfterContainerPosition) {
afterContainer.size = (nextSplitbarIndex !== null) ?
(oldAfterContainerPosition + afterContainer.size) - (newPosition + dividerSize) :
elementSize - (newPosition + dividerSize);
Expand All@@ -121,7 +128,7 @@ angular.module('ui.layout', [])
}

// move the splitbar
ctrl.movingSplitbar[position] = newPosition;
ctrl.movingSplitbar.position = newPosition;

// broadcast an event that resize happened (debounced to 50ms)
if(debounceEvent) $timeout.cancel(debounceEvent);
Expand All@@ -143,9 +150,11 @@ angular.module('ui.layout', [])
var scrollX = window.pageXOffset || body.scrollLeft;
var scrollY = window.pageYOffset || body.scrollTop;
var clientRect = rawDomNode.getBoundingClientRect();
var x = clientRect.left + scrollX;
var y = clientRect.top + scrollY;
return { left: x, top: y };
if (ctrl.isUsingColumnFlow) {
return clientRect[ctrl.sizeProperties.offsetPos] + scrollX;
} else {
return clientRect[ctrl.sizeProperties.offsetPos] + scrollY;
}
}

/**
Expand DownExpand Up@@ -179,7 +188,12 @@ angular.module('ui.layout', [])
(mouseEvent.originalEvent ? mouseEvent.originalEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty] : 0) :
(mouseEvent.targetTouches ? mouseEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty] : 0));

lastPos = mousePos - offset($element)[ctrl.sizeProperties.offsetPos];
if (ctrl.dir === 'rtl' && ctrl.isUsingColumnFlow) {
lastPos = offset($element) - mousePos;
} else {
lastPos = mousePos - offset($element);
}


//Cancel previous rAF call
if(animationFrameRequested) {
Expand All@@ -201,8 +215,8 @@ angular.module('ui.layout', [])
var index = ctrl.containers.indexOf(container);

var setValues = function(container) {
var start = container[ctrl.sizeProperties.flowProperty];
var end = container[ctrl.sizeProperties.flowProperty] + container.size;
var start = container.position;
var end = container.position + container.size;

container.beforeMinValue = angular.isNumber(container.minSize) ? start + container.minSize : start;
container.beforeMaxValue = angular.isNumber(container.maxSize) ? start + container.maxSize : null;
Expand DownExpand Up@@ -317,7 +331,7 @@ angular.module('ui.layout', [])
remainder = availableSize - autoSize * numOfAutoContainers;
for(i=0; i < ctrl.containers.length; i++) {
c = ctrl.containers[i];
c[ctrl.sizeProperties.flowProperty] = usedSpace;
c.position = usedSpace;
c.maxSize = opts.maxSizes[i];
c.minSize = opts.minSizes[i];

Expand DownExpand Up@@ -458,18 +472,18 @@ angular.module('ui.layout', [])

c.size = 0;

if(nextSplitbar) nextSplitbar[ctrl.sizeProperties.flowProperty] -= c.uncollapsedSize;
if(nextSplitbar) nextSplitbar.position -= c.uncollapsedSize;
if(nextContainer) {
nextContainer[ctrl.sizeProperties.flowProperty] -= c.uncollapsedSize;
nextContainer.position -= c.uncollapsedSize;
nextContainer.uncollapsedSize += c.uncollapsedSize;
}

} else {
c.size = c.uncollapsedSize;

if(nextSplitbar) nextSplitbar[ctrl.sizeProperties.flowProperty] += c.uncollapsedSize;
if(nextSplitbar) nextSplitbar.position += c.uncollapsedSize;
if(nextContainer) {
nextContainer[ctrl.sizeProperties.flowProperty] += c.uncollapsedSize;
nextContainer.position += c.uncollapsedSize;
nextContainer.uncollapsedSize -= c.uncollapsedSize;
}
}
Expand All@@ -493,7 +507,6 @@ angular.module('ui.layout', [])
var prevContainer = ctrl.containers[index-2];
var isLastContainer = index === (ctrl.containers.length - 1);
var endDiff;
var flowProperty = ctrl.sizeProperties.flowProperty;
var sizeProperty = ctrl.sizeProperties.sizeProperty;

ctrl.bounds = $element[0].getBoundingClientRect();
Expand All@@ -517,10 +530,10 @@ angular.module('ui.layout', [])

// adds additional space so the splitbar moves to the very end of the container
// to offset the lost space when converting from percents to pixels
endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c[flowProperty] - c.uncollapsedSize : 0;
endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c.position - c.uncollapsedSize : 0;

if(prevSplitbar) {
prevSplitbar[flowProperty] += (c.uncollapsedSize + endDiff);
prevSplitbar.position += (c.uncollapsedSize + endDiff);
}
if(prevContainer) {
prevContainer.size += (c.uncollapsedSize + endDiff);
Expand All@@ -531,10 +544,10 @@ angular.module('ui.layout', [])

// adds additional space so the splitbar moves back to the proper position
// to offset the additional space added when collapsing
endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c[flowProperty] - c.uncollapsedSize : 0;
endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c.position - c.uncollapsedSize : 0;

if(prevSplitbar) {
prevSplitbar[flowProperty] -= (c.uncollapsedSize + endDiff);
prevSplitbar.position -= (c.uncollapsedSize + endDiff);
}
if(prevContainer) {
prevContainer.size -= (c.uncollapsedSize + endDiff);
Expand DownExpand Up@@ -849,7 +862,7 @@ angular.module('ui.layout', [])
element.css(ctrl.sizeProperties.sizeProperty, newValue + 'px');
});

scope.$watch('splitbar.' + ctrl.sizeProperties.flowProperty, function(newValue) {
scope.$watch('splitbar.position', function(newValue) {
element.css(ctrl.sizeProperties.flowProperty, newValue + 'px');
});

Expand DownExpand Up@@ -938,7 +951,7 @@ angular.module('ui.layout', [])
}
});

scope.$watch('container.' + ctrl.sizeProperties.flowProperty, function(newValue) {
scope.$watch('container.position', function(newValue) {
element.css(ctrl.sizeProperties.flowProperty, newValue + 'px');
});

Expand DownExpand Up@@ -1094,8 +1107,7 @@ angular.module('ui.layout', [])
// Splitbar container
function SplitbarContainer() {
this.size = 10;
this.left = 0;
this.top = 0;
this.position = 0;
this.element = null;
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content

This repository was archived by the owner on Sep 8, 2020. It is now read-only.

Adding RTL support#169
 Open

widmoser
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Adding RTL support
#169
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2d48e18

refactor(rtlSupport): removed depencency of container position on flo…


widmoser Dec 9, 2015
14b1425

feat(rtlSupport): adjusting flowProperty according to ui layout's dir…


widmoser Dec 9, 2015
53741f8

feat(rtlSupport): fixed mouse move calculations for rtl layouts


widmoser Dec 9, 2015
e71c419

test: added tests for rtl direction


widmoser Feb 20, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


68 changes: 40 additions & 28 deletions
src/ui-layout.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,14 @@ angular.module('ui.layout', [])
 mouseProperty: 'clientX',
 flowPropertyPosition: 'x' };

 $scope.$watch($window.getComputedStyle($element[0], null).direction, function() {
 ctrl.dir = $window.getComputedStyle($element[0], null).direction;
 if (ctrl.isUsingColumnFlow) {
 ctrl.sizeProperties.flowProperty = ctrl.sizeProperties.offsetPos = (ctrl.dir === 'rtl') ? 'right' : 'left';
 ctrl.calculate();
 }
 });

 $element
 // Force the layout to fill the parent space
 // fix no height layout...
Expand DownExpand Up@@ -67,7 +75,6 @@ angular.module('ui.layout', [])

 var debounceEvent;
 function draw() {
 var position = ctrl.sizeProperties.flowProperty;
 var dividerSize = parseInt(opts.dividerSize);
 var elementSize = $element[0][ctrl.sizeProperties.offsetSize];

Expand All@@ -82,8 +89,8 @@ angular.module('ui.layout', [])

 if(!beforeContainer.collapsed && !afterContainer.collapsed) {
 // calculate container positons
 var difference = ctrl.movingSplitbar[position] - lastPos;
 var newPosition = ctrl.movingSplitbar[position] - difference;
 var difference = ctrl.movingSplitbar.position - lastPos;
 var newPosition = ctrl.movingSplitbar.position - difference;

 // Keep the bar in the window (no left/top 100%)
 newPosition = Math.min(elementSize-dividerSize, newPosition);
Expand All@@ -103,16 +110,16 @@ angular.module('ui.layout', [])
 newPosition = afterContainer.afterMaxValue;

 // resize the before container
 beforeContainer.size = newPosition - beforeContainer[position];
 beforeContainer.size = newPosition - beforeContainer.position;
 // store the current value to preserve this size during onResize
 beforeContainer.uncollapsedSize = beforeContainer.size;

 // update after container position
 var oldAfterContainerPosition = afterContainer[position];
 afterContainer[position] = newPosition + dividerSize;
 var oldAfterContainerPosition = afterContainer.position;
 afterContainer.position = newPosition + dividerSize;

 //update after container size if the position has changed
 if(afterContainer[position] != oldAfterContainerPosition) {
 if(afterContainer.position != oldAfterContainerPosition) {
 afterContainer.size = (nextSplitbarIndex !== null) ?
 (oldAfterContainerPosition + afterContainer.size) - (newPosition + dividerSize) :
 elementSize - (newPosition + dividerSize);
Expand All@@ -121,7 +128,7 @@ angular.module('ui.layout', [])
 }

 // move the splitbar
 ctrl.movingSplitbar[position] = newPosition;
 ctrl.movingSplitbar.position = newPosition;

 // broadcast an event that resize happened (debounced to 50ms)
 if(debounceEvent) $timeout.cancel(debounceEvent);
Expand All@@ -143,9 +150,11 @@ angular.module('ui.layout', [])
 var scrollX = window.pageXOffset || body.scrollLeft;
 var scrollY = window.pageYOffset || body.scrollTop;
 var clientRect = rawDomNode.getBoundingClientRect();
 var x = clientRect.left + scrollX;
 var y = clientRect.top + scrollY;
 return { left: x, top: y };
 if (ctrl.isUsingColumnFlow) {
 return clientRect[ctrl.sizeProperties.offsetPos] + scrollX;
 } else {
 return clientRect[ctrl.sizeProperties.offsetPos] + scrollY;
 }
 }

 /**
Expand DownExpand Up@@ -179,7 +188,12 @@ angular.module('ui.layout', [])
 (mouseEvent.originalEvent ? mouseEvent.originalEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty] : 0) :
 (mouseEvent.targetTouches ? mouseEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty] : 0));

 lastPos = mousePos - offset($element)[ctrl.sizeProperties.offsetPos];
 if (ctrl.dir === 'rtl' && ctrl.isUsingColumnFlow) {
 lastPos = offset($element) - mousePos;
 } else {
 lastPos = mousePos - offset($element);
 }


 //Cancel previous rAF call
 if(animationFrameRequested) {
Expand All@@ -201,8 +215,8 @@ angular.module('ui.layout', [])
 var index = ctrl.containers.indexOf(container);

 var setValues = function(container) {
 var start = container[ctrl.sizeProperties.flowProperty];
 var end = container[ctrl.sizeProperties.flowProperty] + container.size;
 var start = container.position;
 var end = container.position + container.size;

 container.beforeMinValue = angular.isNumber(container.minSize) ? start + container.minSize : start;
 container.beforeMaxValue = angular.isNumber(container.maxSize) ? start + container.maxSize : null;
Expand DownExpand Up@@ -317,7 +331,7 @@ angular.module('ui.layout', [])
 remainder = availableSize - autoSize * numOfAutoContainers;
 for(i=0; i < ctrl.containers.length; i++) {
 c = ctrl.containers[i];
 c[ctrl.sizeProperties.flowProperty] = usedSpace;
 c.position = usedSpace;
 c.maxSize = opts.maxSizes[i];
 c.minSize = opts.minSizes[i];

Expand DownExpand Up@@ -458,18 +472,18 @@ angular.module('ui.layout', [])

 c.size = 0;

 if(nextSplitbar) nextSplitbar[ctrl.sizeProperties.flowProperty] -= c.uncollapsedSize;
 if(nextSplitbar) nextSplitbar.position -= c.uncollapsedSize;
 if(nextContainer) {
 nextContainer[ctrl.sizeProperties.flowProperty] -= c.uncollapsedSize;
 nextContainer.position -= c.uncollapsedSize;
 nextContainer.uncollapsedSize += c.uncollapsedSize;
 }

 } else {
 c.size = c.uncollapsedSize;

 if(nextSplitbar) nextSplitbar[ctrl.sizeProperties.flowProperty] += c.uncollapsedSize;
 if(nextSplitbar) nextSplitbar.position += c.uncollapsedSize;
 if(nextContainer) {
 nextContainer[ctrl.sizeProperties.flowProperty] += c.uncollapsedSize;
 nextContainer.position += c.uncollapsedSize;
 nextContainer.uncollapsedSize -= c.uncollapsedSize;
 }
 }
Expand All@@ -493,7 +507,6 @@ angular.module('ui.layout', [])
 var prevContainer = ctrl.containers[index-2];
 var isLastContainer = index === (ctrl.containers.length - 1);
 var endDiff;
 var flowProperty = ctrl.sizeProperties.flowProperty;
 var sizeProperty = ctrl.sizeProperties.sizeProperty;

 ctrl.bounds = $element[0].getBoundingClientRect();
Expand All@@ -517,10 +530,10 @@ angular.module('ui.layout', [])

 // adds additional space so the splitbar moves to the very end of the container
 // to offset the lost space when converting from percents to pixels
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c[flowProperty] - c.uncollapsedSize : 0;
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c.position - c.uncollapsedSize : 0;

 if(prevSplitbar) {
 prevSplitbar[flowProperty] += (c.uncollapsedSize + endDiff);
 prevSplitbar.position += (c.uncollapsedSize + endDiff);
 }
 if(prevContainer) {
 prevContainer.size += (c.uncollapsedSize + endDiff);
Expand All@@ -531,10 +544,10 @@ angular.module('ui.layout', [])

 // adds additional space so the splitbar moves back to the proper position
 // to offset the additional space added when collapsing
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c[flowProperty] - c.uncollapsedSize : 0;
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c.position - c.uncollapsedSize : 0;

 if(prevSplitbar) {
 prevSplitbar[flowProperty] -= (c.uncollapsedSize + endDiff);
 prevSplitbar.position -= (c.uncollapsedSize + endDiff);
 }
 if(prevContainer) {
 prevContainer.size -= (c.uncollapsedSize + endDiff);
Expand DownExpand Up@@ -849,7 +862,7 @@ angular.module('ui.layout', [])
 element.css(ctrl.sizeProperties.sizeProperty, newValue + 'px');
 });

 scope.$watch('splitbar.' + ctrl.sizeProperties.flowProperty, function(newValue) {
 scope.$watch('splitbar.position', function(newValue) {
 element.css(ctrl.sizeProperties.flowProperty, newValue + 'px');
 });

Expand DownExpand Up@@ -938,7 +951,7 @@ angular.module('ui.layout', [])
 }
 });

 scope.$watch('container.' + ctrl.sizeProperties.flowProperty, function(newValue) {
 scope.$watch('container.position', function(newValue) {
 element.css(ctrl.sizeProperties.flowProperty, newValue + 'px');
 });

Expand DownExpand Up@@ -1094,8 +1107,7 @@ angular.module('ui.layout', [])
 // Splitbar container
 function SplitbarContainer() {
 this.size = 10;
 this.left = 0;
 this.top = 0;
 this.position = 0;
 this.element = null;
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Sep 8, 2020. It is now read-only.

Adding RTL support#169
 Open

widmoser
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Adding RTL support
#169
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2d48e18

refactor(rtlSupport): removed depencency of container position on flo…


widmoser Dec 9, 2015
14b1425

feat(rtlSupport): adjusting flowProperty according to ui layout's dir…


widmoser Dec 9, 2015
53741f8

feat(rtlSupport): fixed mouse move calculations for rtl layouts


widmoser Dec 9, 2015
e71c419

test: added tests for rtl direction


widmoser Feb 20, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


68 changes: 40 additions & 28 deletions
src/ui-layout.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,14 @@ angular.module('ui.layout', [])
 mouseProperty: 'clientX',
 flowPropertyPosition: 'x' };

 $scope.$watch($window.getComputedStyle($element[0], null).direction, function() {
 ctrl.dir = $window.getComputedStyle($element[0], null).direction;
 if (ctrl.isUsingColumnFlow) {
 ctrl.sizeProperties.flowProperty = ctrl.sizeProperties.offsetPos = (ctrl.dir === 'rtl') ? 'right' : 'left';
 ctrl.calculate();
 }
 });

 $element
 // Force the layout to fill the parent space
 // fix no height layout...
Expand DownExpand Up@@ -67,7 +75,6 @@ angular.module('ui.layout', [])

 var debounceEvent;
 function draw() {
 var position = ctrl.sizeProperties.flowProperty;
 var dividerSize = parseInt(opts.dividerSize);
 var elementSize = $element[0][ctrl.sizeProperties.offsetSize];

Expand All@@ -82,8 +89,8 @@ angular.module('ui.layout', [])

 if(!beforeContainer.collapsed && !afterContainer.collapsed) {
 // calculate container positons
 var difference = ctrl.movingSplitbar[position] - lastPos;
 var newPosition = ctrl.movingSplitbar[position] - difference;
 var difference = ctrl.movingSplitbar.position - lastPos;
 var newPosition = ctrl.movingSplitbar.position - difference;

 // Keep the bar in the window (no left/top 100%)
 newPosition = Math.min(elementSize-dividerSize, newPosition);
Expand All@@ -103,16 +110,16 @@ angular.module('ui.layout', [])
 newPosition = afterContainer.afterMaxValue;

 // resize the before container
 beforeContainer.size = newPosition - beforeContainer[position];
 beforeContainer.size = newPosition - beforeContainer.position;
 // store the current value to preserve this size during onResize
 beforeContainer.uncollapsedSize = beforeContainer.size;

 // update after container position
 var oldAfterContainerPosition = afterContainer[position];
 afterContainer[position] = newPosition + dividerSize;
 var oldAfterContainerPosition = afterContainer.position;
 afterContainer.position = newPosition + dividerSize;

 //update after container size if the position has changed
 if(afterContainer[position] != oldAfterContainerPosition) {
 if(afterContainer.position != oldAfterContainerPosition) {
 afterContainer.size = (nextSplitbarIndex !== null) ?
 (oldAfterContainerPosition + afterContainer.size) - (newPosition + dividerSize) :
 elementSize - (newPosition + dividerSize);
Expand All@@ -121,7 +128,7 @@ angular.module('ui.layout', [])
 }

 // move the splitbar
 ctrl.movingSplitbar[position] = newPosition;
 ctrl.movingSplitbar.position = newPosition;

 // broadcast an event that resize happened (debounced to 50ms)
 if(debounceEvent) $timeout.cancel(debounceEvent);
Expand All@@ -143,9 +150,11 @@ angular.module('ui.layout', [])
 var scrollX = window.pageXOffset || body.scrollLeft;
 var scrollY = window.pageYOffset || body.scrollTop;
 var clientRect = rawDomNode.getBoundingClientRect();
 var x = clientRect.left + scrollX;
 var y = clientRect.top + scrollY;
 return { left: x, top: y };
 if (ctrl.isUsingColumnFlow) {
 return clientRect[ctrl.sizeProperties.offsetPos] + scrollX;
 } else {
 return clientRect[ctrl.sizeProperties.offsetPos] + scrollY;
 }
 }

 /**
Expand DownExpand Up@@ -179,7 +188,12 @@ angular.module('ui.layout', [])
 (mouseEvent.originalEvent ? mouseEvent.originalEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty] : 0) :
 (mouseEvent.targetTouches ? mouseEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty] : 0));

 lastPos = mousePos - offset($element)[ctrl.sizeProperties.offsetPos];
 if (ctrl.dir === 'rtl' && ctrl.isUsingColumnFlow) {
 lastPos = offset($element) - mousePos;
 } else {
 lastPos = mousePos - offset($element);
 }


 //Cancel previous rAF call
 if(animationFrameRequested) {
Expand All@@ -201,8 +215,8 @@ angular.module('ui.layout', [])
 var index = ctrl.containers.indexOf(container);

 var setValues = function(container) {
 var start = container[ctrl.sizeProperties.flowProperty];
 var end = container[ctrl.sizeProperties.flowProperty] + container.size;
 var start = container.position;
 var end = container.position + container.size;

 container.beforeMinValue = angular.isNumber(container.minSize) ? start + container.minSize : start;
 container.beforeMaxValue = angular.isNumber(container.maxSize) ? start + container.maxSize : null;
Expand DownExpand Up@@ -317,7 +331,7 @@ angular.module('ui.layout', [])
 remainder = availableSize - autoSize * numOfAutoContainers;
 for(i=0; i < ctrl.containers.length; i++) {
 c = ctrl.containers[i];
 c[ctrl.sizeProperties.flowProperty] = usedSpace;
 c.position = usedSpace;
 c.maxSize = opts.maxSizes[i];
 c.minSize = opts.minSizes[i];

Expand DownExpand Up@@ -458,18 +472,18 @@ angular.module('ui.layout', [])

 c.size = 0;

 if(nextSplitbar) nextSplitbar[ctrl.sizeProperties.flowProperty] -= c.uncollapsedSize;
 if(nextSplitbar) nextSplitbar.position -= c.uncollapsedSize;
 if(nextContainer) {
 nextContainer[ctrl.sizeProperties.flowProperty] -= c.uncollapsedSize;
 nextContainer.position -= c.uncollapsedSize;
 nextContainer.uncollapsedSize += c.uncollapsedSize;
 }

 } else {
 c.size = c.uncollapsedSize;

 if(nextSplitbar) nextSplitbar[ctrl.sizeProperties.flowProperty] += c.uncollapsedSize;
 if(nextSplitbar) nextSplitbar.position += c.uncollapsedSize;
 if(nextContainer) {
 nextContainer[ctrl.sizeProperties.flowProperty] += c.uncollapsedSize;
 nextContainer.position += c.uncollapsedSize;
 nextContainer.uncollapsedSize -= c.uncollapsedSize;
 }
 }
Expand All@@ -493,7 +507,6 @@ angular.module('ui.layout', [])
 var prevContainer = ctrl.containers[index-2];
 var isLastContainer = index === (ctrl.containers.length - 1);
 var endDiff;
 var flowProperty = ctrl.sizeProperties.flowProperty;
 var sizeProperty = ctrl.sizeProperties.sizeProperty;

 ctrl.bounds = $element[0].getBoundingClientRect();
Expand All@@ -517,10 +530,10 @@ angular.module('ui.layout', [])

 // adds additional space so the splitbar moves to the very end of the container
 // to offset the lost space when converting from percents to pixels
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c[flowProperty] - c.uncollapsedSize : 0;
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c.position - c.uncollapsedSize : 0;

 if(prevSplitbar) {
 prevSplitbar[flowProperty] += (c.uncollapsedSize + endDiff);
 prevSplitbar.position += (c.uncollapsedSize + endDiff);
 }
 if(prevContainer) {
 prevContainer.size += (c.uncollapsedSize + endDiff);
Expand All@@ -531,10 +544,10 @@ angular.module('ui.layout', [])

 // adds additional space so the splitbar moves back to the proper position
 // to offset the additional space added when collapsing
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c[flowProperty] - c.uncollapsedSize : 0;
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c.position - c.uncollapsedSize : 0;

 if(prevSplitbar) {
 prevSplitbar[flowProperty] -= (c.uncollapsedSize + endDiff);
 prevSplitbar.position -= (c.uncollapsedSize + endDiff);
 }
 if(prevContainer) {
 prevContainer.size -= (c.uncollapsedSize + endDiff);
Expand DownExpand Up@@ -849,7 +862,7 @@ angular.module('ui.layout', [])
 element.css(ctrl.sizeProperties.sizeProperty, newValue + 'px');
 });

 scope.$watch('splitbar.' + ctrl.sizeProperties.flowProperty, function(newValue) {
 scope.$watch('splitbar.position', function(newValue) {
 element.css(ctrl.sizeProperties.flowProperty, newValue + 'px');
 });

Expand DownExpand Up@@ -938,7 +951,7 @@ angular.module('ui.layout', [])
 }
 });

 scope.$watch('container.' + ctrl.sizeProperties.flowProperty, function(newValue) {
 scope.$watch('container.position', function(newValue) {
 element.css(ctrl.sizeProperties.flowProperty, newValue + 'px');
 });

Expand DownExpand Up@@ -1094,8 +1107,7 @@ angular.module('ui.layout', [])
 // Splitbar container
 function SplitbarContainer() {
 this.size = 10;
 this.left = 0;
 this.top = 0;
 this.position = 0;
 this.element = null;
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Sep 8, 2020. It is now read-only.

Adding RTL support#169
 Open

widmoser
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Adding RTL support
#169
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2d48e18

refactor(rtlSupport): removed depencency of container position on flo…


widmoser Dec 9, 2015
14b1425

feat(rtlSupport): adjusting flowProperty according to ui layout's dir…


widmoser Dec 9, 2015
53741f8

feat(rtlSupport): fixed mouse move calculations for rtl layouts


widmoser Dec 9, 2015
e71c419

test: added tests for rtl direction


widmoser Feb 20, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


68 changes: 40 additions & 28 deletions
src/ui-layout.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,14 @@ angular.module('ui.layout', [])
 mouseProperty: 'clientX',
 flowPropertyPosition: 'x' };

 $scope.$watch($window.getComputedStyle($element[0], null).direction, function() {
 ctrl.dir = $window.getComputedStyle($element[0], null).direction;
 if (ctrl.isUsingColumnFlow) {
 ctrl.sizeProperties.flowProperty = ctrl.sizeProperties.offsetPos = (ctrl.dir === 'rtl') ? 'right' : 'left';
 ctrl.calculate();
 }
 });

 $element
 // Force the layout to fill the parent space
 // fix no height layout...
Expand DownExpand Up@@ -67,7 +75,6 @@ angular.module('ui.layout', [])

 var debounceEvent;
 function draw() {
 var position = ctrl.sizeProperties.flowProperty;
 var dividerSize = parseInt(opts.dividerSize);
 var elementSize = $element[0][ctrl.sizeProperties.offsetSize];

Expand All@@ -82,8 +89,8 @@ angular.module('ui.layout', [])

 if(!beforeContainer.collapsed && !afterContainer.collapsed) {
 // calculate container positons
 var difference = ctrl.movingSplitbar[position] - lastPos;
 var newPosition = ctrl.movingSplitbar[position] - difference;
 var difference = ctrl.movingSplitbar.position - lastPos;
 var newPosition = ctrl.movingSplitbar.position - difference;

 // Keep the bar in the window (no left/top 100%)
 newPosition = Math.min(elementSize-dividerSize, newPosition);
Expand All@@ -103,16 +110,16 @@ angular.module('ui.layout', [])
 newPosition = afterContainer.afterMaxValue;

 // resize the before container
 beforeContainer.size = newPosition - beforeContainer[position];
 beforeContainer.size = newPosition - beforeContainer.position;
 // store the current value to preserve this size during onResize
 beforeContainer.uncollapsedSize = beforeContainer.size;

 // update after container position
 var oldAfterContainerPosition = afterContainer[position];
 afterContainer[position] = newPosition + dividerSize;
 var oldAfterContainerPosition = afterContainer.position;
 afterContainer.position = newPosition + dividerSize;

 //update after container size if the position has changed
 if(afterContainer[position] != oldAfterContainerPosition) {
 if(afterContainer.position != oldAfterContainerPosition) {
 afterContainer.size = (nextSplitbarIndex !== null) ?
 (oldAfterContainerPosition + afterContainer.size) - (newPosition + dividerSize) :
 elementSize - (newPosition + dividerSize);
Expand All@@ -121,7 +128,7 @@ angular.module('ui.layout', [])
 }

 // move the splitbar
 ctrl.movingSplitbar[position] = newPosition;
 ctrl.movingSplitbar.position = newPosition;

 // broadcast an event that resize happened (debounced to 50ms)
 if(debounceEvent) $timeout.cancel(debounceEvent);
Expand All@@ -143,9 +150,11 @@ angular.module('ui.layout', [])
 var scrollX = window.pageXOffset || body.scrollLeft;
 var scrollY = window.pageYOffset || body.scrollTop;
 var clientRect = rawDomNode.getBoundingClientRect();
 var x = clientRect.left + scrollX;
 var y = clientRect.top + scrollY;
 return { left: x, top: y };
 if (ctrl.isUsingColumnFlow) {
 return clientRect[ctrl.sizeProperties.offsetPos] + scrollX;
 } else {
 return clientRect[ctrl.sizeProperties.offsetPos] + scrollY;
 }
 }

 /**
Expand DownExpand Up@@ -179,7 +188,12 @@ angular.module('ui.layout', [])
 (mouseEvent.originalEvent ? mouseEvent.originalEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty] : 0) :
 (mouseEvent.targetTouches ? mouseEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty] : 0));

 lastPos = mousePos - offset($element)[ctrl.sizeProperties.offsetPos];
 if (ctrl.dir === 'rtl' && ctrl.isUsingColumnFlow) {
 lastPos = offset($element) - mousePos;
 } else {
 lastPos = mousePos - offset($element);
 }


 //Cancel previous rAF call
 if(animationFrameRequested) {
Expand All@@ -201,8 +215,8 @@ angular.module('ui.layout', [])
 var index = ctrl.containers.indexOf(container);

 var setValues = function(container) {
 var start = container[ctrl.sizeProperties.flowProperty];
 var end = container[ctrl.sizeProperties.flowProperty] + container.size;
 var start = container.position;
 var end = container.position + container.size;

 container.beforeMinValue = angular.isNumber(container.minSize) ? start + container.minSize : start;
 container.beforeMaxValue = angular.isNumber(container.maxSize) ? start + container.maxSize : null;
Expand DownExpand Up@@ -317,7 +331,7 @@ angular.module('ui.layout', [])
 remainder = availableSize - autoSize * numOfAutoContainers;
 for(i=0; i < ctrl.containers.length; i++) {
 c = ctrl.containers[i];
 c[ctrl.sizeProperties.flowProperty] = usedSpace;
 c.position = usedSpace;
 c.maxSize = opts.maxSizes[i];
 c.minSize = opts.minSizes[i];

Expand DownExpand Up@@ -458,18 +472,18 @@ angular.module('ui.layout', [])

 c.size = 0;

 if(nextSplitbar) nextSplitbar[ctrl.sizeProperties.flowProperty] -= c.uncollapsedSize;
 if(nextSplitbar) nextSplitbar.position -= c.uncollapsedSize;
 if(nextContainer) {
 nextContainer[ctrl.sizeProperties.flowProperty] -= c.uncollapsedSize;
 nextContainer.position -= c.uncollapsedSize;
 nextContainer.uncollapsedSize += c.uncollapsedSize;
 }

 } else {
 c.size = c.uncollapsedSize;

 if(nextSplitbar) nextSplitbar[ctrl.sizeProperties.flowProperty] += c.uncollapsedSize;
 if(nextSplitbar) nextSplitbar.position += c.uncollapsedSize;
 if(nextContainer) {
 nextContainer[ctrl.sizeProperties.flowProperty] += c.uncollapsedSize;
 nextContainer.position += c.uncollapsedSize;
 nextContainer.uncollapsedSize -= c.uncollapsedSize;
 }
 }
Expand All@@ -493,7 +507,6 @@ angular.module('ui.layout', [])
 var prevContainer = ctrl.containers[index-2];
 var isLastContainer = index === (ctrl.containers.length - 1);
 var endDiff;
 var flowProperty = ctrl.sizeProperties.flowProperty;
 var sizeProperty = ctrl.sizeProperties.sizeProperty;

 ctrl.bounds = $element[0].getBoundingClientRect();
Expand All@@ -517,10 +530,10 @@ angular.module('ui.layout', [])

 // adds additional space so the splitbar moves to the very end of the container
 // to offset the lost space when converting from percents to pixels
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c[flowProperty] - c.uncollapsedSize : 0;
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c.position - c.uncollapsedSize : 0;

 if(prevSplitbar) {
 prevSplitbar[flowProperty] += (c.uncollapsedSize + endDiff);
 prevSplitbar.position += (c.uncollapsedSize + endDiff);
 }
 if(prevContainer) {
 prevContainer.size += (c.uncollapsedSize + endDiff);
Expand All@@ -531,10 +544,10 @@ angular.module('ui.layout', [])

 // adds additional space so the splitbar moves back to the proper position
 // to offset the additional space added when collapsing
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c[flowProperty] - c.uncollapsedSize : 0;
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c.position - c.uncollapsedSize : 0;

 if(prevSplitbar) {
 prevSplitbar[flowProperty] -= (c.uncollapsedSize + endDiff);
 prevSplitbar.position -= (c.uncollapsedSize + endDiff);
 }
 if(prevContainer) {
 prevContainer.size -= (c.uncollapsedSize + endDiff);
Expand DownExpand Up@@ -849,7 +862,7 @@ angular.module('ui.layout', [])
 element.css(ctrl.sizeProperties.sizeProperty, newValue + 'px');
 });

 scope.$watch('splitbar.' + ctrl.sizeProperties.flowProperty, function(newValue) {
 scope.$watch('splitbar.position', function(newValue) {
 element.css(ctrl.sizeProperties.flowProperty, newValue + 'px');
 });

Expand DownExpand Up@@ -938,7 +951,7 @@ angular.module('ui.layout', [])
 }
 });

 scope.$watch('container.' + ctrl.sizeProperties.flowProperty, function(newValue) {
 scope.$watch('container.position', function(newValue) {
 element.css(ctrl.sizeProperties.flowProperty, newValue + 'px');
 });

Expand DownExpand Up@@ -1094,8 +1107,7 @@ angular.module('ui.layout', [])
 // Splitbar container
 function SplitbarContainer() {
 this.size = 10;
 this.left = 0;
 this.top = 0;
 this.position = 0;
 this.element = null;
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content

This repository was archived by the owner on Sep 8, 2020. It is now read-only.

Adding RTL support#169
 Open

widmoser
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Adding RTL support
#169
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2d48e18

refactor(rtlSupport): removed depencency of container position on flo…


widmoser Dec 9, 2015
14b1425

feat(rtlSupport): adjusting flowProperty according to ui layout's dir…


widmoser Dec 9, 2015
53741f8

feat(rtlSupport): fixed mouse move calculations for rtl layouts


widmoser Dec 9, 2015
e71c419

test: added tests for rtl direction


widmoser Feb 20, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


68 changes: 40 additions & 28 deletions
src/ui-layout.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,14 @@ angular.module('ui.layout', [])
 mouseProperty: 'clientX',
 flowPropertyPosition: 'x' };

 $scope.$watch($window.getComputedStyle($element[0], null).direction, function() {
 ctrl.dir = $window.getComputedStyle($element[0], null).direction;
 if (ctrl.isUsingColumnFlow) {
 ctrl.sizeProperties.flowProperty = ctrl.sizeProperties.offsetPos = (ctrl.dir === 'rtl') ? 'right' : 'left';
 ctrl.calculate();
 }
 });

 $element
 // Force the layout to fill the parent space
 // fix no height layout...
Expand DownExpand Up@@ -67,7 +75,6 @@ angular.module('ui.layout', [])

 var debounceEvent;
 function draw() {
 var position = ctrl.sizeProperties.flowProperty;
 var dividerSize = parseInt(opts.dividerSize);
 var elementSize = $element[0][ctrl.sizeProperties.offsetSize];

Expand All@@ -82,8 +89,8 @@ angular.module('ui.layout', [])

 if(!beforeContainer.collapsed && !afterContainer.collapsed) {
 // calculate container positons
 var difference = ctrl.movingSplitbar[position] - lastPos;
 var newPosition = ctrl.movingSplitbar[position] - difference;
 var difference = ctrl.movingSplitbar.position - lastPos;
 var newPosition = ctrl.movingSplitbar.position - difference;

 // Keep the bar in the window (no left/top 100%)
 newPosition = Math.min(elementSize-dividerSize, newPosition);
Expand All@@ -103,16 +110,16 @@ angular.module('ui.layout', [])
 newPosition = afterContainer.afterMaxValue;

 // resize the before container
 beforeContainer.size = newPosition - beforeContainer[position];
 beforeContainer.size = newPosition - beforeContainer.position;
 // store the current value to preserve this size during onResize
 beforeContainer.uncollapsedSize = beforeContainer.size;

 // update after container position
 var oldAfterContainerPosition = afterContainer[position];
 afterContainer[position] = newPosition + dividerSize;
 var oldAfterContainerPosition = afterContainer.position;
 afterContainer.position = newPosition + dividerSize;

 //update after container size if the position has changed
 if(afterContainer[position] != oldAfterContainerPosition) {
 if(afterContainer.position != oldAfterContainerPosition) {
 afterContainer.size = (nextSplitbarIndex !== null) ?
 (oldAfterContainerPosition + afterContainer.size) - (newPosition + dividerSize) :
 elementSize - (newPosition + dividerSize);
Expand All@@ -121,7 +128,7 @@ angular.module('ui.layout', [])
 }

 // move the splitbar
 ctrl.movingSplitbar[position] = newPosition;
 ctrl.movingSplitbar.position = newPosition;

 // broadcast an event that resize happened (debounced to 50ms)
 if(debounceEvent) $timeout.cancel(debounceEvent);
Expand All@@ -143,9 +150,11 @@ angular.module('ui.layout', [])
 var scrollX = window.pageXOffset || body.scrollLeft;
 var scrollY = window.pageYOffset || body.scrollTop;
 var clientRect = rawDomNode.getBoundingClientRect();
 var x = clientRect.left + scrollX;
 var y = clientRect.top + scrollY;
 return { left: x, top: y };
 if (ctrl.isUsingColumnFlow) {
 return clientRect[ctrl.sizeProperties.offsetPos] + scrollX;
 } else {
 return clientRect[ctrl.sizeProperties.offsetPos] + scrollY;
 }
 }

 /**
Expand DownExpand Up@@ -179,7 +188,12 @@ angular.module('ui.layout', [])
 (mouseEvent.originalEvent ? mouseEvent.originalEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty] : 0) :
 (mouseEvent.targetTouches ? mouseEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty] : 0));

 lastPos = mousePos - offset($element)[ctrl.sizeProperties.offsetPos];
 if (ctrl.dir === 'rtl' && ctrl.isUsingColumnFlow) {
 lastPos = offset($element) - mousePos;
 } else {
 lastPos = mousePos - offset($element);
 }


 //Cancel previous rAF call
 if(animationFrameRequested) {
Expand All@@ -201,8 +215,8 @@ angular.module('ui.layout', [])
 var index = ctrl.containers.indexOf(container);

 var setValues = function(container) {
 var start = container[ctrl.sizeProperties.flowProperty];
 var end = container[ctrl.sizeProperties.flowProperty] + container.size;
 var start = container.position;
 var end = container.position + container.size;

 container.beforeMinValue = angular.isNumber(container.minSize) ? start + container.minSize : start;
 container.beforeMaxValue = angular.isNumber(container.maxSize) ? start + container.maxSize : null;
Expand DownExpand Up@@ -317,7 +331,7 @@ angular.module('ui.layout', [])
 remainder = availableSize - autoSize * numOfAutoContainers;
 for(i=0; i < ctrl.containers.length; i++) {
 c = ctrl.containers[i];
 c[ctrl.sizeProperties.flowProperty] = usedSpace;
 c.position = usedSpace;
 c.maxSize = opts.maxSizes[i];
 c.minSize = opts.minSizes[i];

Expand DownExpand Up@@ -458,18 +472,18 @@ angular.module('ui.layout', [])

 c.size = 0;

 if(nextSplitbar) nextSplitbar[ctrl.sizeProperties.flowProperty] -= c.uncollapsedSize;
 if(nextSplitbar) nextSplitbar.position -= c.uncollapsedSize;
 if(nextContainer) {
 nextContainer[ctrl.sizeProperties.flowProperty] -= c.uncollapsedSize;
 nextContainer.position -= c.uncollapsedSize;
 nextContainer.uncollapsedSize += c.uncollapsedSize;
 }

 } else {
 c.size = c.uncollapsedSize;

 if(nextSplitbar) nextSplitbar[ctrl.sizeProperties.flowProperty] += c.uncollapsedSize;
 if(nextSplitbar) nextSplitbar.position += c.uncollapsedSize;
 if(nextContainer) {
 nextContainer[ctrl.sizeProperties.flowProperty] += c.uncollapsedSize;
 nextContainer.position += c.uncollapsedSize;
 nextContainer.uncollapsedSize -= c.uncollapsedSize;
 }
 }
Expand All@@ -493,7 +507,6 @@ angular.module('ui.layout', [])
 var prevContainer = ctrl.containers[index-2];
 var isLastContainer = index === (ctrl.containers.length - 1);
 var endDiff;
 var flowProperty = ctrl.sizeProperties.flowProperty;
 var sizeProperty = ctrl.sizeProperties.sizeProperty;

 ctrl.bounds = $element[0].getBoundingClientRect();
Expand All@@ -517,10 +530,10 @@ angular.module('ui.layout', [])

 // adds additional space so the splitbar moves to the very end of the container
 // to offset the lost space when converting from percents to pixels
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c[flowProperty] - c.uncollapsedSize : 0;
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c.position - c.uncollapsedSize : 0;

 if(prevSplitbar) {
 prevSplitbar[flowProperty] += (c.uncollapsedSize + endDiff);
 prevSplitbar.position += (c.uncollapsedSize + endDiff);
 }
 if(prevContainer) {
 prevContainer.size += (c.uncollapsedSize + endDiff);
Expand All@@ -531,10 +544,10 @@ angular.module('ui.layout', [])

 // adds additional space so the splitbar moves back to the proper position
 // to offset the additional space added when collapsing
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c[flowProperty] - c.uncollapsedSize : 0;
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c.position - c.uncollapsedSize : 0;

 if(prevSplitbar) {
 prevSplitbar[flowProperty] -= (c.uncollapsedSize + endDiff);
 prevSplitbar.position -= (c.uncollapsedSize + endDiff);
 }
 if(prevContainer) {
 prevContainer.size -= (c.uncollapsedSize + endDiff);
Expand DownExpand Up@@ -849,7 +862,7 @@ angular.module('ui.layout', [])
 element.css(ctrl.sizeProperties.sizeProperty, newValue + 'px');
 });

 scope.$watch('splitbar.' + ctrl.sizeProperties.flowProperty, function(newValue) {
 scope.$watch('splitbar.position', function(newValue) {
 element.css(ctrl.sizeProperties.flowProperty, newValue + 'px');
 });

Expand DownExpand Up@@ -938,7 +951,7 @@ angular.module('ui.layout', [])
 }
 });

 scope.$watch('container.' + ctrl.sizeProperties.flowProperty, function(newValue) {
 scope.$watch('container.position', function(newValue) {
 element.css(ctrl.sizeProperties.flowProperty, newValue + 'px');
 });

Expand DownExpand Up@@ -1094,8 +1107,7 @@ angular.module('ui.layout', [])
 // Splitbar container
 function SplitbarContainer() {
 this.size = 10;
 this.left = 0;
 this.top = 0;
 this.position = 0;
 this.element = null;
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Sep 8, 2020. It is now read-only.

Adding RTL support#169
 Open

widmoser
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Adding RTL support
#169
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2d48e18

refactor(rtlSupport): removed depencency of container position on flo…


widmoser Dec 9, 2015
14b1425

feat(rtlSupport): adjusting flowProperty according to ui layout's dir…


widmoser Dec 9, 2015
53741f8

feat(rtlSupport): fixed mouse move calculations for rtl layouts


widmoser Dec 9, 2015
e71c419

test: added tests for rtl direction


widmoser Feb 20, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


68 changes: 40 additions & 28 deletions
src/ui-layout.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,14 @@ angular.module('ui.layout', [])
 mouseProperty: 'clientX',
 flowPropertyPosition: 'x' };

 $scope.$watch($window.getComputedStyle($element[0], null).direction, function() {
 ctrl.dir = $window.getComputedStyle($element[0], null).direction;
 if (ctrl.isUsingColumnFlow) {
 ctrl.sizeProperties.flowProperty = ctrl.sizeProperties.offsetPos = (ctrl.dir === 'rtl') ? 'right' : 'left';
 ctrl.calculate();
 }
 });

 $element
 // Force the layout to fill the parent space
 // fix no height layout...
Expand DownExpand Up@@ -67,7 +75,6 @@ angular.module('ui.layout', [])

 var debounceEvent;
 function draw() {
 var position = ctrl.sizeProperties.flowProperty;
 var dividerSize = parseInt(opts.dividerSize);
 var elementSize = $element[0][ctrl.sizeProperties.offsetSize];

Expand All@@ -82,8 +89,8 @@ angular.module('ui.layout', [])

 if(!beforeContainer.collapsed && !afterContainer.collapsed) {
 // calculate container positons
 var difference = ctrl.movingSplitbar[position] - lastPos;
 var newPosition = ctrl.movingSplitbar[position] - difference;
 var difference = ctrl.movingSplitbar.position - lastPos;
 var newPosition = ctrl.movingSplitbar.position - difference;

 // Keep the bar in the window (no left/top 100%)
 newPosition = Math.min(elementSize-dividerSize, newPosition);
Expand All@@ -103,16 +110,16 @@ angular.module('ui.layout', [])
 newPosition = afterContainer.afterMaxValue;

 // resize the before container
 beforeContainer.size = newPosition - beforeContainer[position];
 beforeContainer.size = newPosition - beforeContainer.position;
 // store the current value to preserve this size during onResize
 beforeContainer.uncollapsedSize = beforeContainer.size;

 // update after container position
 var oldAfterContainerPosition = afterContainer[position];
 afterContainer[position] = newPosition + dividerSize;
 var oldAfterContainerPosition = afterContainer.position;
 afterContainer.position = newPosition + dividerSize;

 //update after container size if the position has changed
 if(afterContainer[position] != oldAfterContainerPosition) {
 if(afterContainer.position != oldAfterContainerPosition) {
 afterContainer.size = (nextSplitbarIndex !== null) ?
 (oldAfterContainerPosition + afterContainer.size) - (newPosition + dividerSize) :
 elementSize - (newPosition + dividerSize);
Expand All@@ -121,7 +128,7 @@ angular.module('ui.layout', [])
 }

 // move the splitbar
 ctrl.movingSplitbar[position] = newPosition;
 ctrl.movingSplitbar.position = newPosition;

 // broadcast an event that resize happened (debounced to 50ms)
 if(debounceEvent) $timeout.cancel(debounceEvent);
Expand All@@ -143,9 +150,11 @@ angular.module('ui.layout', [])
 var scrollX = window.pageXOffset || body.scrollLeft;
 var scrollY = window.pageYOffset || body.scrollTop;
 var clientRect = rawDomNode.getBoundingClientRect();
 var x = clientRect.left + scrollX;
 var y = clientRect.top + scrollY;
 return { left: x, top: y };
 if (ctrl.isUsingColumnFlow) {
 return clientRect[ctrl.sizeProperties.offsetPos] + scrollX;
 } else {
 return clientRect[ctrl.sizeProperties.offsetPos] + scrollY;
 }
 }

 /**
Expand DownExpand Up@@ -179,7 +188,12 @@ angular.module('ui.layout', [])
 (mouseEvent.originalEvent ? mouseEvent.originalEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty] : 0) :
 (mouseEvent.targetTouches ? mouseEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty] : 0));

 lastPos = mousePos - offset($element)[ctrl.sizeProperties.offsetPos];
 if (ctrl.dir === 'rtl' && ctrl.isUsingColumnFlow) {
 lastPos = offset($element) - mousePos;
 } else {
 lastPos = mousePos - offset($element);
 }


 //Cancel previous rAF call
 if(animationFrameRequested) {
Expand All@@ -201,8 +215,8 @@ angular.module('ui.layout', [])
 var index = ctrl.containers.indexOf(container);

 var setValues = function(container) {
 var start = container[ctrl.sizeProperties.flowProperty];
 var end = container[ctrl.sizeProperties.flowProperty] + container.size;
 var start = container.position;
 var end = container.position + container.size;

 container.beforeMinValue = angular.isNumber(container.minSize) ? start + container.minSize : start;
 container.beforeMaxValue = angular.isNumber(container.maxSize) ? start + container.maxSize : null;
Expand DownExpand Up@@ -317,7 +331,7 @@ angular.module('ui.layout', [])
 remainder = availableSize - autoSize * numOfAutoContainers;
 for(i=0; i < ctrl.containers.length; i++) {
 c = ctrl.containers[i];
 c[ctrl.sizeProperties.flowProperty] = usedSpace;
 c.position = usedSpace;
 c.maxSize = opts.maxSizes[i];
 c.minSize = opts.minSizes[i];

Expand DownExpand Up@@ -458,18 +472,18 @@ angular.module('ui.layout', [])

 c.size = 0;

 if(nextSplitbar) nextSplitbar[ctrl.sizeProperties.flowProperty] -= c.uncollapsedSize;
 if(nextSplitbar) nextSplitbar.position -= c.uncollapsedSize;
 if(nextContainer) {
 nextContainer[ctrl.sizeProperties.flowProperty] -= c.uncollapsedSize;
 nextContainer.position -= c.uncollapsedSize;
 nextContainer.uncollapsedSize += c.uncollapsedSize;
 }

 } else {
 c.size = c.uncollapsedSize;

 if(nextSplitbar) nextSplitbar[ctrl.sizeProperties.flowProperty] += c.uncollapsedSize;
 if(nextSplitbar) nextSplitbar.position += c.uncollapsedSize;
 if(nextContainer) {
 nextContainer[ctrl.sizeProperties.flowProperty] += c.uncollapsedSize;
 nextContainer.position += c.uncollapsedSize;
 nextContainer.uncollapsedSize -= c.uncollapsedSize;
 }
 }
Expand All@@ -493,7 +507,6 @@ angular.module('ui.layout', [])
 var prevContainer = ctrl.containers[index-2];
 var isLastContainer = index === (ctrl.containers.length - 1);
 var endDiff;
 var flowProperty = ctrl.sizeProperties.flowProperty;
 var sizeProperty = ctrl.sizeProperties.sizeProperty;

 ctrl.bounds = $element[0].getBoundingClientRect();
Expand All@@ -517,10 +530,10 @@ angular.module('ui.layout', [])

 // adds additional space so the splitbar moves to the very end of the container
 // to offset the lost space when converting from percents to pixels
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c[flowProperty] - c.uncollapsedSize : 0;
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c.position - c.uncollapsedSize : 0;

 if(prevSplitbar) {
 prevSplitbar[flowProperty] += (c.uncollapsedSize + endDiff);
 prevSplitbar.position += (c.uncollapsedSize + endDiff);
 }
 if(prevContainer) {
 prevContainer.size += (c.uncollapsedSize + endDiff);
Expand All@@ -531,10 +544,10 @@ angular.module('ui.layout', [])

 // adds additional space so the splitbar moves back to the proper position
 // to offset the additional space added when collapsing
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c[flowProperty] - c.uncollapsedSize : 0;
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c.position - c.uncollapsedSize : 0;

 if(prevSplitbar) {
 prevSplitbar[flowProperty] -= (c.uncollapsedSize + endDiff);
 prevSplitbar.position -= (c.uncollapsedSize + endDiff);
 }
 if(prevContainer) {
 prevContainer.size -= (c.uncollapsedSize + endDiff);
Expand DownExpand Up@@ -849,7 +862,7 @@ angular.module('ui.layout', [])
 element.css(ctrl.sizeProperties.sizeProperty, newValue + 'px');
 });

 scope.$watch('splitbar.' + ctrl.sizeProperties.flowProperty, function(newValue) {
 scope.$watch('splitbar.position', function(newValue) {
 element.css(ctrl.sizeProperties.flowProperty, newValue + 'px');
 });

Expand DownExpand Up@@ -938,7 +951,7 @@ angular.module('ui.layout', [])
 }
 });

 scope.$watch('container.' + ctrl.sizeProperties.flowProperty, function(newValue) {
 scope.$watch('container.position', function(newValue) {
 element.css(ctrl.sizeProperties.flowProperty, newValue + 'px');
 });

Expand DownExpand Up@@ -1094,8 +1107,7 @@ angular.module('ui.layout', [])
 // Splitbar container
 function SplitbarContainer() {
 this.size = 10;
 this.left = 0;
 this.top = 0;
 this.position = 0;
 this.element = null;
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Sep 8, 2020. It is now read-only.

Adding RTL support#169
 Open

widmoser
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Adding RTL support
#169
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2d48e18

refactor(rtlSupport): removed depencency of container position on flo…


widmoser Dec 9, 2015
14b1425

feat(rtlSupport): adjusting flowProperty according to ui layout's dir…


widmoser Dec 9, 2015
53741f8

feat(rtlSupport): fixed mouse move calculations for rtl layouts


widmoser Dec 9, 2015
e71c419

test: added tests for rtl direction


widmoser Feb 20, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


68 changes: 40 additions & 28 deletions
src/ui-layout.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,14 @@ angular.module('ui.layout', [])
 mouseProperty: 'clientX',
 flowPropertyPosition: 'x' };

 $scope.$watch($window.getComputedStyle($element[0], null).direction, function() {
 ctrl.dir = $window.getComputedStyle($element[0], null).direction;
 if (ctrl.isUsingColumnFlow) {
 ctrl.sizeProperties.flowProperty = ctrl.sizeProperties.offsetPos = (ctrl.dir === 'rtl') ? 'right' : 'left';
 ctrl.calculate();
 }
 });

 $element
 // Force the layout to fill the parent space
 // fix no height layout...
Expand DownExpand Up@@ -67,7 +75,6 @@ angular.module('ui.layout', [])

 var debounceEvent;
 function draw() {
 var position = ctrl.sizeProperties.flowProperty;
 var dividerSize = parseInt(opts.dividerSize);
 var elementSize = $element[0][ctrl.sizeProperties.offsetSize];

Expand All@@ -82,8 +89,8 @@ angular.module('ui.layout', [])

 if(!beforeContainer.collapsed && !afterContainer.collapsed) {
 // calculate container positons
 var difference = ctrl.movingSplitbar[position] - lastPos;
 var newPosition = ctrl.movingSplitbar[position] - difference;
 var difference = ctrl.movingSplitbar.position - lastPos;
 var newPosition = ctrl.movingSplitbar.position - difference;

 // Keep the bar in the window (no left/top 100%)
 newPosition = Math.min(elementSize-dividerSize, newPosition);
Expand All@@ -103,16 +110,16 @@ angular.module('ui.layout', [])
 newPosition = afterContainer.afterMaxValue;

 // resize the before container
 beforeContainer.size = newPosition - beforeContainer[position];
 beforeContainer.size = newPosition - beforeContainer.position;
 // store the current value to preserve this size during onResize
 beforeContainer.uncollapsedSize = beforeContainer.size;

 // update after container position
 var oldAfterContainerPosition = afterContainer[position];
 afterContainer[position] = newPosition + dividerSize;
 var oldAfterContainerPosition = afterContainer.position;
 afterContainer.position = newPosition + dividerSize;

 //update after container size if the position has changed
 if(afterContainer[position] != oldAfterContainerPosition) {
 if(afterContainer.position != oldAfterContainerPosition) {
 afterContainer.size = (nextSplitbarIndex !== null) ?
 (oldAfterContainerPosition + afterContainer.size) - (newPosition + dividerSize) :
 elementSize - (newPosition + dividerSize);
Expand All@@ -121,7 +128,7 @@ angular.module('ui.layout', [])
 }

 // move the splitbar
 ctrl.movingSplitbar[position] = newPosition;
 ctrl.movingSplitbar.position = newPosition;

 // broadcast an event that resize happened (debounced to 50ms)
 if(debounceEvent) $timeout.cancel(debounceEvent);
Expand All@@ -143,9 +150,11 @@ angular.module('ui.layout', [])
 var scrollX = window.pageXOffset || body.scrollLeft;
 var scrollY = window.pageYOffset || body.scrollTop;
 var clientRect = rawDomNode.getBoundingClientRect();
 var x = clientRect.left + scrollX;
 var y = clientRect.top + scrollY;
 return { left: x, top: y };
 if (ctrl.isUsingColumnFlow) {
 return clientRect[ctrl.sizeProperties.offsetPos] + scrollX;
 } else {
 return clientRect[ctrl.sizeProperties.offsetPos] + scrollY;
 }
 }

 /**
Expand DownExpand Up@@ -179,7 +188,12 @@ angular.module('ui.layout', [])
 (mouseEvent.originalEvent ? mouseEvent.originalEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty] : 0) :
 (mouseEvent.targetTouches ? mouseEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty] : 0));

 lastPos = mousePos - offset($element)[ctrl.sizeProperties.offsetPos];
 if (ctrl.dir === 'rtl' && ctrl.isUsingColumnFlow) {
 lastPos = offset($element) - mousePos;
 } else {
 lastPos = mousePos - offset($element);
 }


 //Cancel previous rAF call
 if(animationFrameRequested) {
Expand All@@ -201,8 +215,8 @@ angular.module('ui.layout', [])
 var index = ctrl.containers.indexOf(container);

 var setValues = function(container) {
 var start = container[ctrl.sizeProperties.flowProperty];
 var end = container[ctrl.sizeProperties.flowProperty] + container.size;
 var start = container.position;
 var end = container.position + container.size;

 container.beforeMinValue = angular.isNumber(container.minSize) ? start + container.minSize : start;
 container.beforeMaxValue = angular.isNumber(container.maxSize) ? start + container.maxSize : null;
Expand DownExpand Up@@ -317,7 +331,7 @@ angular.module('ui.layout', [])
 remainder = availableSize - autoSize * numOfAutoContainers;
 for(i=0; i < ctrl.containers.length; i++) {
 c = ctrl.containers[i];
 c[ctrl.sizeProperties.flowProperty] = usedSpace;
 c.position = usedSpace;
 c.maxSize = opts.maxSizes[i];
 c.minSize = opts.minSizes[i];

Expand DownExpand Up@@ -458,18 +472,18 @@ angular.module('ui.layout', [])

 c.size = 0;

 if(nextSplitbar) nextSplitbar[ctrl.sizeProperties.flowProperty] -= c.uncollapsedSize;
 if(nextSplitbar) nextSplitbar.position -= c.uncollapsedSize;
 if(nextContainer) {
 nextContainer[ctrl.sizeProperties.flowProperty] -= c.uncollapsedSize;
 nextContainer.position -= c.uncollapsedSize;
 nextContainer.uncollapsedSize += c.uncollapsedSize;
 }

 } else {
 c.size = c.uncollapsedSize;

 if(nextSplitbar) nextSplitbar[ctrl.sizeProperties.flowProperty] += c.uncollapsedSize;
 if(nextSplitbar) nextSplitbar.position += c.uncollapsedSize;
 if(nextContainer) {
 nextContainer[ctrl.sizeProperties.flowProperty] += c.uncollapsedSize;
 nextContainer.position += c.uncollapsedSize;
 nextContainer.uncollapsedSize -= c.uncollapsedSize;
 }
 }
Expand All@@ -493,7 +507,6 @@ angular.module('ui.layout', [])
 var prevContainer = ctrl.containers[index-2];
 var isLastContainer = index === (ctrl.containers.length - 1);
 var endDiff;
 var flowProperty = ctrl.sizeProperties.flowProperty;
 var sizeProperty = ctrl.sizeProperties.sizeProperty;

 ctrl.bounds = $element[0].getBoundingClientRect();
Expand All@@ -517,10 +530,10 @@ angular.module('ui.layout', [])

 // adds additional space so the splitbar moves to the very end of the container
 // to offset the lost space when converting from percents to pixels
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c[flowProperty] - c.uncollapsedSize : 0;
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c.position - c.uncollapsedSize : 0;

 if(prevSplitbar) {
 prevSplitbar[flowProperty] += (c.uncollapsedSize + endDiff);
 prevSplitbar.position += (c.uncollapsedSize + endDiff);
 }
 if(prevContainer) {
 prevContainer.size += (c.uncollapsedSize + endDiff);
Expand All@@ -531,10 +544,10 @@ angular.module('ui.layout', [])

 // adds additional space so the splitbar moves back to the proper position
 // to offset the additional space added when collapsing
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c[flowProperty] - c.uncollapsedSize : 0;
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c.position - c.uncollapsedSize : 0;

 if(prevSplitbar) {
 prevSplitbar[flowProperty] -= (c.uncollapsedSize + endDiff);
 prevSplitbar.position -= (c.uncollapsedSize + endDiff);
 }
 if(prevContainer) {
 prevContainer.size -= (c.uncollapsedSize + endDiff);
Expand DownExpand Up@@ -849,7 +862,7 @@ angular.module('ui.layout', [])
 element.css(ctrl.sizeProperties.sizeProperty, newValue + 'px');
 });

 scope.$watch('splitbar.' + ctrl.sizeProperties.flowProperty, function(newValue) {
 scope.$watch('splitbar.position', function(newValue) {
 element.css(ctrl.sizeProperties.flowProperty, newValue + 'px');
 });

Expand DownExpand Up@@ -938,7 +951,7 @@ angular.module('ui.layout', [])
 }
 });

 scope.$watch('container.' + ctrl.sizeProperties.flowProperty, function(newValue) {
 scope.$watch('container.position', function(newValue) {
 element.css(ctrl.sizeProperties.flowProperty, newValue + 'px');
 });

Expand DownExpand Up@@ -1094,8 +1107,7 @@ angular.module('ui.layout', [])
 // Splitbar container
 function SplitbarContainer() {
 this.size = 10;
 this.left = 0;
 this.top = 0;
 this.position = 0;
 this.element = null;
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content

This repository was archived by the owner on Sep 8, 2020. It is now read-only.

Adding RTL support#169
 Open

widmoser
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Adding RTL support
#169
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
2d48e18

refactor(rtlSupport): removed depencency of container position on flo…


widmoser Dec 9, 2015
14b1425

feat(rtlSupport): adjusting flowProperty according to ui layout's dir…


widmoser Dec 9, 2015
53741f8

feat(rtlSupport): fixed mouse move calculations for rtl layouts


widmoser Dec 9, 2015
e71c419

test: added tests for rtl direction


widmoser Feb 20, 2016

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


68 changes: 40 additions & 28 deletions
src/ui-layout.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,14 @@ angular.module('ui.layout', [])
 mouseProperty: 'clientX',
 flowPropertyPosition: 'x' };

 $scope.$watch($window.getComputedStyle($element[0], null).direction, function() {
 ctrl.dir = $window.getComputedStyle($element[0], null).direction;
 if (ctrl.isUsingColumnFlow) {
 ctrl.sizeProperties.flowProperty = ctrl.sizeProperties.offsetPos = (ctrl.dir === 'rtl') ? 'right' : 'left';
 ctrl.calculate();
 }
 });

 $element
 // Force the layout to fill the parent space
 // fix no height layout...
Expand DownExpand Up@@ -67,7 +75,6 @@ angular.module('ui.layout', [])

 var debounceEvent;
 function draw() {
 var position = ctrl.sizeProperties.flowProperty;
 var dividerSize = parseInt(opts.dividerSize);
 var elementSize = $element[0][ctrl.sizeProperties.offsetSize];

Expand All@@ -82,8 +89,8 @@ angular.module('ui.layout', [])

 if(!beforeContainer.collapsed && !afterContainer.collapsed) {
 // calculate container positons
 var difference = ctrl.movingSplitbar[position] - lastPos;
 var newPosition = ctrl.movingSplitbar[position] - difference;
 var difference = ctrl.movingSplitbar.position - lastPos;
 var newPosition = ctrl.movingSplitbar.position - difference;

 // Keep the bar in the window (no left/top 100%)
 newPosition = Math.min(elementSize-dividerSize, newPosition);
Expand All@@ -103,16 +110,16 @@ angular.module('ui.layout', [])
 newPosition = afterContainer.afterMaxValue;

 // resize the before container
 beforeContainer.size = newPosition - beforeContainer[position];
 beforeContainer.size = newPosition - beforeContainer.position;
 // store the current value to preserve this size during onResize
 beforeContainer.uncollapsedSize = beforeContainer.size;

 // update after container position
 var oldAfterContainerPosition = afterContainer[position];
 afterContainer[position] = newPosition + dividerSize;
 var oldAfterContainerPosition = afterContainer.position;
 afterContainer.position = newPosition + dividerSize;

 //update after container size if the position has changed
 if(afterContainer[position] != oldAfterContainerPosition) {
 if(afterContainer.position != oldAfterContainerPosition) {
 afterContainer.size = (nextSplitbarIndex !== null) ?
 (oldAfterContainerPosition + afterContainer.size) - (newPosition + dividerSize) :
 elementSize - (newPosition + dividerSize);
Expand All@@ -121,7 +128,7 @@ angular.module('ui.layout', [])
 }

 // move the splitbar
 ctrl.movingSplitbar[position] = newPosition;
 ctrl.movingSplitbar.position = newPosition;

 // broadcast an event that resize happened (debounced to 50ms)
 if(debounceEvent) $timeout.cancel(debounceEvent);
Expand All@@ -143,9 +150,11 @@ angular.module('ui.layout', [])
 var scrollX = window.pageXOffset || body.scrollLeft;
 var scrollY = window.pageYOffset || body.scrollTop;
 var clientRect = rawDomNode.getBoundingClientRect();
 var x = clientRect.left + scrollX;
 var y = clientRect.top + scrollY;
 return { left: x, top: y };
 if (ctrl.isUsingColumnFlow) {
 return clientRect[ctrl.sizeProperties.offsetPos] + scrollX;
 } else {
 return clientRect[ctrl.sizeProperties.offsetPos] + scrollY;
 }
 }

 /**
Expand DownExpand Up@@ -179,7 +188,12 @@ angular.module('ui.layout', [])
 (mouseEvent.originalEvent ? mouseEvent.originalEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty] : 0) :
 (mouseEvent.targetTouches ? mouseEvent.targetTouches[0][ctrl.sizeProperties.mouseProperty] : 0));

 lastPos = mousePos - offset($element)[ctrl.sizeProperties.offsetPos];
 if (ctrl.dir === 'rtl' && ctrl.isUsingColumnFlow) {
 lastPos = offset($element) - mousePos;
 } else {
 lastPos = mousePos - offset($element);
 }


 //Cancel previous rAF call
 if(animationFrameRequested) {
Expand All@@ -201,8 +215,8 @@ angular.module('ui.layout', [])
 var index = ctrl.containers.indexOf(container);

 var setValues = function(container) {
 var start = container[ctrl.sizeProperties.flowProperty];
 var end = container[ctrl.sizeProperties.flowProperty] + container.size;
 var start = container.position;
 var end = container.position + container.size;

 container.beforeMinValue = angular.isNumber(container.minSize) ? start + container.minSize : start;
 container.beforeMaxValue = angular.isNumber(container.maxSize) ? start + container.maxSize : null;
Expand DownExpand Up@@ -317,7 +331,7 @@ angular.module('ui.layout', [])
 remainder = availableSize - autoSize * numOfAutoContainers;
 for(i=0; i < ctrl.containers.length; i++) {
 c = ctrl.containers[i];
 c[ctrl.sizeProperties.flowProperty] = usedSpace;
 c.position = usedSpace;
 c.maxSize = opts.maxSizes[i];
 c.minSize = opts.minSizes[i];

Expand DownExpand Up@@ -458,18 +472,18 @@ angular.module('ui.layout', [])

 c.size = 0;

 if(nextSplitbar) nextSplitbar[ctrl.sizeProperties.flowProperty] -= c.uncollapsedSize;
 if(nextSplitbar) nextSplitbar.position -= c.uncollapsedSize;
 if(nextContainer) {
 nextContainer[ctrl.sizeProperties.flowProperty] -= c.uncollapsedSize;
 nextContainer.position -= c.uncollapsedSize;
 nextContainer.uncollapsedSize += c.uncollapsedSize;
 }

 } else {
 c.size = c.uncollapsedSize;

 if(nextSplitbar) nextSplitbar[ctrl.sizeProperties.flowProperty] += c.uncollapsedSize;
 if(nextSplitbar) nextSplitbar.position += c.uncollapsedSize;
 if(nextContainer) {
 nextContainer[ctrl.sizeProperties.flowProperty] += c.uncollapsedSize;
 nextContainer.position += c.uncollapsedSize;
 nextContainer.uncollapsedSize -= c.uncollapsedSize;
 }
 }
Expand All@@ -493,7 +507,6 @@ angular.module('ui.layout', [])
 var prevContainer = ctrl.containers[index-2];
 var isLastContainer = index === (ctrl.containers.length - 1);
 var endDiff;
 var flowProperty = ctrl.sizeProperties.flowProperty;
 var sizeProperty = ctrl.sizeProperties.sizeProperty;

 ctrl.bounds = $element[0].getBoundingClientRect();
Expand All@@ -517,10 +530,10 @@ angular.module('ui.layout', [])

 // adds additional space so the splitbar moves to the very end of the container
 // to offset the lost space when converting from percents to pixels
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c[flowProperty] - c.uncollapsedSize : 0;
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c.position - c.uncollapsedSize : 0;

 if(prevSplitbar) {
 prevSplitbar[flowProperty] += (c.uncollapsedSize + endDiff);
 prevSplitbar.position += (c.uncollapsedSize + endDiff);
 }
 if(prevContainer) {
 prevContainer.size += (c.uncollapsedSize + endDiff);
Expand All@@ -531,10 +544,10 @@ angular.module('ui.layout', [])

 // adds additional space so the splitbar moves back to the proper position
 // to offset the additional space added when collapsing
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c[flowProperty] - c.uncollapsedSize : 0;
 endDiff = (isLastContainer) ? ctrl.bounds[sizeProperty] - c.position - c.uncollapsedSize : 0;

 if(prevSplitbar) {
 prevSplitbar[flowProperty] -= (c.uncollapsedSize + endDiff);
 prevSplitbar.position -= (c.uncollapsedSize + endDiff);
 }
 if(prevContainer) {
 prevContainer.size -= (c.uncollapsedSize + endDiff);
Expand DownExpand Up@@ -849,7 +862,7 @@ angular.module('ui.layout', [])
 element.css(ctrl.sizeProperties.sizeProperty, newValue + 'px');
 });

 scope.$watch('splitbar.' + ctrl.sizeProperties.flowProperty, function(newValue) {
 scope.$watch('splitbar.position', function(newValue) {
 element.css(ctrl.sizeProperties.flowProperty, newValue + 'px');
 });

Expand DownExpand Up@@ -938,7 +951,7 @@ angular.module('ui.layout', [])
 }
 });

 scope.$watch('container.' + ctrl.sizeProperties.flowProperty, function(newValue) {
 scope.$watch('container.position', function(newValue) {
 element.css(ctrl.sizeProperties.flowProperty, newValue + 'px');
 });

Expand DownExpand Up@@ -1094,8 +1107,7 @@ angular.module('ui.layout', [])
 // Splitbar container
 function SplitbarContainer() {
 this.size = 10;
 this.left = 0;
 this.top = 0;
 this.position = 0;
 this.element = null;
 }

Expand Down
Loading