FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

SegmentedBar unbound items not firing selectedIndex change events by hdeshev · Pull Request #2191 · NativeScript/NativeScript · GitHub

/ NativeScript Public

SegmentedBar unbound items not firing selectedIndex change events #2191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hdeshev merged 2 commits into from
May 30, 2016
Conversation 2 Commits 2 Checks 0 Files changed
Merged

SegmentedBar unbound items not firing selectedIndex change events #2191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b812411
Fix SegmentedBar selectedIndex change event when items not bound.
hdeshev May 26, 2016
2ebe9d6
Fix node-tests on OSX by explicitly requiring modules with relative p…
hdeshev May 30, 2016
File filter

Filter by extension

Filter by extension .js  (1) .ts  (6) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
12 changes: 6 additions & 6 deletions gruntfile.js
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ module.exports = function(grunt) {
};

var nodeTestEnv = JSON.parse(JSON.stringify(process.env));
nodeTestEnv.NODE_PATH = localCfg.outTnsCoreModules
nodeTestEnv.NODE_PATH = localCfg.outTnsCoreModules;

localCfg.nodeTestsDir = path.join(localCfg.outDir, 'node-tests');

Expand Down Expand Up @@ -546,10 +546,10 @@ module.exports = function(grunt) {
grunt.file.write(combinedDtsPath, dtsLines.join('\n'));
}
function generateModulesDts(outDir) {
var angularConflicts = ['module.d.ts']
var angularConflicts = ['module.d.ts'];
var angularExcludes = angularConflicts.map(function(file) {
return '!' + file;
})
});
var nonES6Files = [
'es-collections.d.ts',
'es6-promise.d.ts',
Expand All @@ -558,7 +558,7 @@ module.exports = function(grunt) {
];
var es6Excludes = nonES6Files.map(function(file) {
return '!' + file;
})
});
var dtsFiles = grunt.file.expand({cwd: localCfg.outTnsCoreModules }, [
"**/*.d.ts",
//Exclude the d.ts files in the apps folder - these are part of the apps and are already packed there!
Expand All @@ -582,8 +582,8 @@ module.exports = function(grunt) {
writeDtsFile(es6Files, outDir, 'tns-core-modules/tns-core-modules.es6.d.ts');
var allFiles = angularConflicts.concat(nonES6Files).concat(['tns-core-modules.base.d.ts']);
writeDtsFile(allFiles, outDir, 'tns-core-modules/tns-core-modules.d.ts');
};
}

grunt.registerTask("processTestsApp", function(outTestsAppDir, pkgAppNameSuffix) {
var tasks = [
{
Expand Down
1 change: 1 addition & 0 deletions node-tests/node-shims.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
declare var require: any;
5 changes: 3 additions & 2 deletions node-tests/test-angular-xml.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import {assert} from "chai";
import xml = require('xml');
import * as xmlModule from "xml";
var xml: typeof xmlModule = require("../tns-core-modules/xml");

describe("angular xml parser", () => {
let last_element = null;
let last_attrs = null;
let parser = null;

beforeEach(() => {
parser = new xml.XmlParser(function (event: xml.ParserEvent) {
parser = new xml.XmlParser(function (event: xmlModule.ParserEvent) {
switch (event.eventType) {
case xml.ParserEventType.StartElement:
last_element = event.elementName;
Expand Down
5 changes: 3 additions & 2 deletions node-tests/test-xml.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {assert} from "chai";
import xml = require('xml');
import * as xmlModule from "xml";
var xml: typeof xmlModule = require("../tns-core-modules/xml");

describe("xml parser", () => {
let last_element = null;
Expand All @@ -8,7 +9,7 @@ describe("xml parser", () => {
let parser = null;

beforeEach(() => {
parser = new xml.XmlParser(function (event: xml.ParserEvent) {
parser = new xml.XmlParser(function (event: xmlModule.ParserEvent) {
switch (event.eventType) {
case xml.ParserEventType.StartElement:
last_element = event.elementName;
Expand Down
72 changes: 47 additions & 25 deletions tests/app/ui/segmented-bar/segmented-bar-tests.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import TKUnit = require("../../TKUnit");
import helper = require("../helper");
import viewModule = require("ui/core/view");
import segmentedBarTestsNative = require("./segmented-bar-tests-native");
import bindable = require("ui/core/bindable");
import observable = require("data/observable");
import color = require("color");
import * as TKUnit from "../../TKUnit";
import * as segmentedBarTestsNative from "./segmented-bar-tests-native";
import {buildUIAndRunTest} from "../helper";
import {View} from "ui/core/view";
import {BindingOptions} from "ui/core/bindable";
import {Observable} from "data/observable";
import {Color} from "color";

// >> article-require-segmentedbar-module
import segmentedBarModule = require("ui/segmented-bar");
Expand All @@ -29,7 +29,7 @@ function _createItems(count: number): Array<segmentedBarModule.SegmentedBarItem>
}

export var testWhenSegmentedBarIsCreatedItemsAreUndefined = function () {
helper.buildUIAndRunTest(_createSegmentedBar(), function (views: Array<viewModule.View>) {
buildUIAndRunTest(_createSegmentedBar(), function (views: Array<View>) {
var segmentedBar = <segmentedBarModule.SegmentedBar>views[0];
var expectedValue = undefined;
var actualValue = segmentedBar.items;
Expand All @@ -38,7 +38,7 @@ export var testWhenSegmentedBarIsCreatedItemsAreUndefined = function () {
}

export var testWhenSegmentedBarIsCreatedSelectedIndexIsUndefined = function () {
helper.buildUIAndRunTest(_createSegmentedBar(), function (views: Array<viewModule.View>) {
buildUIAndRunTest(_createSegmentedBar(), function (views: Array<View>) {
var segmentedBar = <segmentedBarModule.SegmentedBar>views[0];
var expectedValue = undefined;
var actualValue = segmentedBar.selectedIndex;
Expand All @@ -47,7 +47,7 @@ export var testWhenSegmentedBarIsCreatedSelectedIndexIsUndefined = function () {
}

export var testWhenSettingItemsToNonEmptyArrayTheSameAmountOfNativeItemsIsCreated = function () {
helper.buildUIAndRunTest(_createSegmentedBar(), function (views: Array<viewModule.View>) {
buildUIAndRunTest(_createSegmentedBar(), function (views: Array<View>) {
var segmentedBar = <segmentedBarModule.SegmentedBar>views[0];
segmentedBar.items = _createItems(10);
var expectedValue = segmentedBar.items.length;
Expand All @@ -57,13 +57,13 @@ export var testWhenSettingItemsToNonEmptyArrayTheSameAmountOfNativeItemsIsCreate
}

export var testWhenItemsAreBoundTheTextColorIsPreserved = function () {
helper.buildUIAndRunTest(_createSegmentedBar(), function (views: Array<viewModule.View>) {
buildUIAndRunTest(_createSegmentedBar(), function (views: Array<View>) {
var segmentedBar = <segmentedBarModule.SegmentedBar>views[0];
segmentedBar.color = new color.Color("red");
segmentedBar.color = new Color("red");

var model = new observable.Observable();
var model = new Observable();
model.set("items", [{ title: "One" }, { title: "Two" }, { title: "Three" }]);
var options: bindable.BindingOptions = {
var options: BindingOptions = {
sourceProperty: "items",
targetProperty: "items"
}
Expand All @@ -75,7 +75,7 @@ export var testWhenItemsAreBoundTheTextColorIsPreserved = function () {
}

export var testWhenSettingItemsToEmptyArrayZeroNativeItemsAreCreated = function () {
helper.buildUIAndRunTest(_createSegmentedBar(), function (views: Array<viewModule.View>) {
buildUIAndRunTest(_createSegmentedBar(), function (views: Array<View>) {
var segmentedBar = <segmentedBarModule.SegmentedBar>views[0];
segmentedBar.items = [];
var expectedValue = segmentedBar.items.length;
Expand All @@ -85,7 +85,7 @@ export var testWhenSettingItemsToEmptyArrayZeroNativeItemsAreCreated = function
}

export var testSelectedIndexBecomesZeroWhenItemsBoundToNonEmptyArray = function () {
helper.buildUIAndRunTest(_createSegmentedBar(), function (views: Array<viewModule.View>) {
buildUIAndRunTest(_createSegmentedBar(), function (views: Array<View>) {
var segmentedBar = <segmentedBarModule.SegmentedBar>views[0];
// >> article-creating-segmentedbar-items
var items = [];
Expand All @@ -107,7 +107,7 @@ export var testSelectedIndexBecomesZeroWhenItemsBoundToNonEmptyArray = function
}

export var testSelectedIndexBecomesUndefinedWhenItemsBoundToEmptyArray = function () {
helper.buildUIAndRunTest(_createSegmentedBar(), function (views: Array<viewModule.View>) {
buildUIAndRunTest(_createSegmentedBar(), function (views: Array<View>) {
var segmentedBar = <segmentedBarModule.SegmentedBar>views[0];
segmentedBar.items = _createItems(10);
// >> artcile-selecting-item
Expand All @@ -121,7 +121,7 @@ export var testSelectedIndexBecomesUndefinedWhenItemsBoundToEmptyArray = functio
}

export var testSelectedIndexBecomesUndefinedWhenItemsBoundToUndefined = function () {
helper.buildUIAndRunTest(_createSegmentedBar(), function (views: Array<viewModule.View>) {
buildUIAndRunTest(_createSegmentedBar(), function (views: Array<View>) {
var segmentedBar = <segmentedBarModule.SegmentedBar>views[0];
segmentedBar.items = _createItems(10);
segmentedBar.selectedIndex = 9;
Expand All @@ -133,7 +133,7 @@ export var testSelectedIndexBecomesUndefinedWhenItemsBoundToUndefined = function
}

export var testSelectedIndexBecomesUndefinedWhenItemsBoundToNull = function () {
helper.buildUIAndRunTest(_createSegmentedBar(), function (views: Array<viewModule.View>) {
buildUIAndRunTest(_createSegmentedBar(), function (views: Array<View>) {
var segmentedBar = <segmentedBarModule.SegmentedBar>views[0];
segmentedBar.items = _createItems(10);
segmentedBar.selectedIndex = 9;
Expand All @@ -149,7 +149,7 @@ export var testItemsIsResolvedCorrectlyIfSetBeforeViewIsLoaded = function () {
var expectedValue = 10;
segmentedBar.items = _createItems(expectedValue);
segmentedBar.selectedIndex = 9;
helper.buildUIAndRunTest(segmentedBar, function (views: Array<viewModule.View>) {
buildUIAndRunTest(segmentedBar, function (views: Array<View>) {
var segmentedBar = <segmentedBarModule.SegmentedBar>views[0];
var actualValue = segmentedBar.items.length;
TKUnit.assert(actualValue === expectedValue, "Actual: " + actualValue + "; Expected: " + expectedValue);
Expand All @@ -161,7 +161,7 @@ export var testSelectedIndexIsResolvedCorrectlyIfSetBeforeViewIsLoaded = functio
segmentedBar.items = _createItems(10);
var expectedValue = 9;
segmentedBar.selectedIndex = expectedValue;
helper.buildUIAndRunTest(segmentedBar, function (views: Array<viewModule.View>) {
buildUIAndRunTest(segmentedBar, function (views: Array<View>) {
var segmentedBar = <segmentedBarModule.SegmentedBar>views[0];
var actualValue = segmentedBar.selectedIndex;
TKUnit.assert(actualValue === expectedValue, "Actual: " + actualValue + "; Expected: " + expectedValue);
Expand All @@ -170,7 +170,7 @@ export var testSelectedIndexIsResolvedCorrectlyIfSetBeforeViewIsLoaded = functio

export var testSettingNegativeSelectedIndexShouldThrow = function () {
var segmentedBar = _createSegmentedBar();
helper.buildUIAndRunTest(segmentedBar, function (views: Array<viewModule.View>) {
buildUIAndRunTest(segmentedBar, function (views: Array<View>) {
var segmentedBar = <segmentedBarModule.SegmentedBar>views[0];
segmentedBar.items = _createItems(10);

Expand All @@ -182,7 +182,7 @@ export var testSettingNegativeSelectedIndexShouldThrow = function () {

export var testSettingSelectedIndexLargerThanCountShouldThrow = function () {
var segmentedBar = _createSegmentedBar();
helper.buildUIAndRunTest(segmentedBar, function (views: Array<viewModule.View>) {
buildUIAndRunTest(segmentedBar, function (views: Array<View>) {
var segmentedBar = <segmentedBarModule.SegmentedBar>views[0];
segmentedBar.items = _createItems(10);
TKUnit.assertThrows(function () {
Expand All @@ -203,7 +203,7 @@ export var testSelectedIndexChangedIsReisedCorrectlyIfSelectedIndexIsSet = funct

segmentedBar.items = _createItems(10);

helper.buildUIAndRunTest(segmentedBar, function (views: Array<viewModule.View>) {
buildUIAndRunTest(segmentedBar, function (views: Array<View>) {
var segmentedBar = <segmentedBarModule.SegmentedBar>views[0];

segmentedBar.selectedIndex = 6;
Expand Down Expand Up @@ -232,7 +232,7 @@ export var testSelectedIndexChangedIsReisedCorrectlyIfSelectedIndexIsSetNative =

segmentedBar.items = _createItems(10);

helper.buildUIAndRunTest(segmentedBar, function (views: Array<viewModule.View>) {
buildUIAndRunTest(segmentedBar, function (views: Array<View>) {
var segmentedBar = <segmentedBarModule.SegmentedBar>views[0];

segmentedBarTestsNative.setNativeSelectedIndex(segmentedBar, 6);
Expand All @@ -248,3 +248,25 @@ export var testSelectedIndexChangedIsReisedCorrectlyIfSelectedIndexIsSetNative =
TKUnit.assertEqual(newIndex, 9);
});
}

export var testSelectedIndexChangedIsRaisedCorrectlyIfItemsNotBound = function () {
const segmentedBar = _createSegmentedBar();
let newSelectedIndex = 0;
segmentedBar.on("selectedIndexChange", () => {
newSelectedIndex = segmentedBar.selectedIndex;
});

buildUIAndRunTest(segmentedBar, function (views: Array<View>) {
const item0 = new segmentedBarModule.SegmentedBarItem();
item0.title = "item 0";
segmentedBar._addChildFromBuilder("SegmentedBarItem", item0);

const item1 = new segmentedBarModule.SegmentedBarItem();
item1.title = "item 1";
segmentedBar._addChildFromBuilder("SegmentedBarItem", item1);
TKUnit.assertEqual(segmentedBar.items.length, 2);

segmentedBarTestsNative.setNativeSelectedIndex(segmentedBar, 1);
TKUnit.assertEqual(newSelectedIndex, 1);
});
}
4 changes: 2 additions & 2 deletions tns-core-modules/ui/segmented-bar/segmented-bar-common.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,10 @@ export class SegmentedBar extends view.View implements definition.SegmentedBar {
let idx: number;
let itemsLength = this.items ? this.items.length : 0;
if (types.isNullOrUndefined(index)) {
idx = itemsLength;
idx = itemsLength - 1;
} else {
if (index < 0 || index > itemsLength) {
idx = itemsLength;
idx = itemsLength - 1;
} else {
idx = index;
}
Expand Down
9 changes: 6 additions & 3 deletions tns-core-modules/ui/segmented-bar/segmented-bar.android.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ function onItemsPropertyChanged(data: dependencyObservable.PropertyChangeData) {
view.android.setCurrentTab(view.selectedIndex);
}

view.android.setOnTabChangedListener(null);
view.android.setOnTabChangedListener(view._listener);

var tabHost = <android.widget.TabHost>view.android;
var tabIndex: number;

Expand Down Expand Up @@ -193,6 +190,12 @@ export class SegmentedBar extends common.SegmentedBar {
}));

this.android.addTab(tab);
this.resetNativeListener();
}

private resetNativeListener() {
this.android.setOnTabChangedListener(null);
this.android.setOnTabChangedListener(this._listener);
}
}

Expand Down
Back | FazBrowse Home | New Git URL