alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Common UI] Tweak mct-scroll-* directives

Browse Source 
Make fixes/tweaks to behavior of mct-scroll-x and mct-scroll-y
directives after testing them against timeline markup. WTD-920.
This commit is contained in:
Victor Woeltjen
2015-02-25 16:28:53 -08:00
parent 9a88e5172a
commit 9fa09e25f0
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/commonUI/general/bundle.json
View File

@@ -108,12 +108,12 @@
}, },
{ {
"key": "mctScrollX", "key": "mctScrollX",
"implementations": "directives/MCTScroll.js", "implementation": "directives/MCTScroll.js",
"depends": [ "$parse", "MCT_SCROLL_X_PROPERTY", "MCT_SCROLL_X_ATTRIBUTE" ] "depends": [ "$parse", "MCT_SCROLL_X_PROPERTY", "MCT_SCROLL_X_ATTRIBUTE" ]
}, },
{ {
"key": "mctScrollY", "key": "mctScrollY",
"implementations": "directives/MCTScroll.js", "implementation": "directives/MCTScroll.js",
"depends": [ "$parse", "MCT_SCROLL_Y_PROPERTY", "MCT_SCROLL_Y_ATTRIBUTE" ] "depends": [ "$parse", "MCT_SCROLL_Y_PROPERTY", "MCT_SCROLL_Y_ATTRIBUTE" ]
} }
], ],

3
platform/commonUI/general/src/directives/MCTScroll.js
View File

@@ -34,7 +34,8 @@ define(
// Handle event; assign to scroll state to scope // Handle event; assign to scroll state to scope
function updateScope() { function updateScope() {
parsed.assign(element[0][property]); parsed.assign(scope, element[0][property]);
scope.$apply(expr);
} }
// Initialize state in scope // Initialize state in scope

7
platform/commonUI/general/test/directives/MCTScrollSpec.js
View File

@@ -26,7 +26,7 @@ define(
mockParsed = jasmine.createSpy('parsed'); mockParsed = jasmine.createSpy('parsed');
mockParsed.assign = jasmine.createSpy('assign'); mockParsed.assign = jasmine.createSpy('assign');
mockScope = jasmine.createSpyObj('$scope', ['$watch']); mockScope = jasmine.createSpyObj('$scope', ['$watch', '$apply']);
mockElement = [{ testProperty: 42 }]; mockElement = [{ testProperty: 42 }];
mockElement.on = jasmine.createSpy('on'); mockElement.on = jasmine.createSpy('on');
@@ -71,7 +71,7 @@ define(
it("publishes initial scroll state", function () { it("publishes initial scroll state", function () {
expect(mockParse).toHaveBeenCalledWith(EXPRESSION); expect(mockParse).toHaveBeenCalledWith(EXPRESSION);
expect(mockParsed.assign).toHaveBeenCalledWith(42); expect(mockParsed.assign).toHaveBeenCalledWith(mockScope, 42);
}); });
it("updates scroll state when scope changes", function () { it("updates scroll state when scope changes", function () {
@@ -82,7 +82,8 @@ define(
it("updates scope when scroll state changes", function () { it("updates scope when scroll state changes", function () {
mockElement[0].testProperty = 12321; mockElement[0].testProperty = 12321;
mockElement.on.mostRecentCall.args[1]({ target: mockElement[0] }); mockElement.on.mostRecentCall.args[1]({ target: mockElement[0] });
expect(mockParsed.assign).toHaveBeenCalledWith(12321); expect(mockParsed.assign).toHaveBeenCalledWith(mockScope, 12321);
expect(mockScope.$apply).toHaveBeenCalledWith(EXPRESSION);
}); });
}); });