-
-
-
-
\ No newline at end of file
diff --git a/Samples/AccountPictureName/js/html/setAccountPicture.html b/Samples/AccountPictureName/js/html/setAccountPicture.html
deleted file mode 100644
index dbceeee048..0000000000
--- a/Samples/AccountPictureName/js/html/setAccountPicture.html
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
- Description:
-
-
- Get the Account Picture for the current user. You can get request three different types: small, large, and video. If the size that is requested is not available an empty file is returned.
-
-
-
-
-
-
- ![image holder]()
- ![image holder]()
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Samples/AccountPictureName/js/html/userFirstAndLastName.html b/Samples/AccountPictureName/js/html/userFirstAndLastName.html
deleted file mode 100644
index dff866477e..0000000000
--- a/Samples/AccountPictureName/js/html/userFirstAndLastName.html
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
- Description:
-
-
- Set the Account Picture image for the current logon user. The setAccountPicture method takes three parameters as input: small image, large image, and video. More than one type can be set in the same call, but a small image must be accompanied - by a large image and/or video. Pass a null for parameters you don't want to set. A change event can be listened to for Account Picture updates. The images below change by listening to the update.
-
-
-
- ![image holder]()
- ![image holder]()
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Samples/AccountPictureName/js/js/getAccountPicture.js b/Samples/AccountPictureName/js/js/getAccountPicture.js
deleted file mode 100644
index 3f09d36e5d..0000000000
--- a/Samples/AccountPictureName/js/js/getAccountPicture.js
+++ /dev/null
@@ -1,71 +0,0 @@
-//// Copyright (c) Microsoft Corporation. All rights reserved
-
-(function () {
- "use strict";
- var page = WinJS.UI.Pages.define("/html/getAccountPicture.html", {
- ready: function (element, options) {
- hideVisibleHolders();
- document.getElementById("getSmallImage").addEventListener("click", getSmallImage, false);
- document.getElementById("getLargeImage").addEventListener("click", getLargeImage, false);
- document.getElementById("getVideo").addEventListener("click", getVideo, false);
- }
- });
-
- function getSmallImage() {
- hideVisibleHolders();
- if (Windows.System.UserProfile.UserInformation.nameAccessAllowed) {
- // The small picture returned by getAccountPicture() is 96x96 pixels in size.
- var image = Windows.System.UserProfile.UserInformation.getAccountPicture(Windows.System.UserProfile.AccountPictureKind.smallImage);
- if (image) {
- document.getElementById("smallImageHolder").style.visibility = "visible";
- document.getElementById("smallImageHolder").src = URL.createObjectURL(image, { oneTimeOnly: true });
- WinJS.log && WinJS.log("Path: " + image.path, "sample", "status");
- } else {
- WinJS.log && WinJS.log("Small account picture is not available.", "sample", "status");
- }
- } else {
- WinJS.log && WinJS.log("Access to account picture disabled by Privacy Setting or Group Policy.", "sample", "error");
- }
- }
-
- function getLargeImage() {
- hideVisibleHolders();
- if (Windows.System.UserProfile.UserInformation.nameAccessAllowed) {
- // The large picture returned by getAccountPicture() is 448x448 pixels in size.
- var image = Windows.System.UserProfile.UserInformation.getAccountPicture(Windows.System.UserProfile.AccountPictureKind.largeImage);
- if (image) {
- document.getElementById("largeImageHolder").style.visibility = "visible";
- document.getElementById("largeImageHolder").src = URL.createObjectURL(image, { oneTimeOnly: true });
- WinJS.log && WinJS.log("Path: " + image.path, "sample", "status");
- } else {
- WinJS.log && WinJS.log("Large account picture is not available.", "sample", "status");
- }
- } else {
- WinJS.log && WinJS.log("Access to account picture disabled by Privacy Setting or Group Policy.", "sample", "error");
- }
- }
-
- function getVideo() {
- hideVisibleHolders();
- if (Windows.System.UserProfile.UserInformation.nameAccessAllowed) {
- // The video returned from getAccountPicture is 448x448 pixels in size.
- var video = Windows.System.UserProfile.UserInformation.getAccountPicture(Windows.System.UserProfile.AccountPictureKind.video);
- if (video) {
- document.getElementById("videoHolder").style.visibility = "visible";
- document.getElementById("videoHolder").src = URL.createObjectURL(video, { oneTimeOnly: true });
- document.getElementById("videoHolder").play();
- WinJS.log && WinJS.log("Path: " + video.path, "sample", "status");
- } else {
- WinJS.log && WinJS.log("Video is not available.", "sample", "status");
- }
- } else {
- WinJS.log && WinJS.log("Access to account picture disabled by Privacy Setting or Group Policy.", "sample", "error");
- }
- }
-
- function hideVisibleHolders() {
- document.getElementById("smallImageHolder").style.visibility = "hidden";
- document.getElementById("largeImageHolder").style.visibility = "hidden";
- document.getElementById("videoHolder").style.visibility = "hidden";
- }
-})();
diff --git a/Samples/AccountPictureName/js/js/sample-configuration.js b/Samples/AccountPictureName/js/js/sample-configuration.js
deleted file mode 100644
index de7c2f0022..0000000000
--- a/Samples/AccountPictureName/js/js/sample-configuration.js
+++ /dev/null
@@ -1,32 +0,0 @@
-//// Copyright (c) Microsoft Corporation. All rights reserved
-
-(function () {
- "use strict";
-
- var sampleTitle = "Account picture name JS sample";
-
- var scenarios = [
- { url: "/html/userDisplayName.html", title: "Get display name" },
- { url: "/html/userFirstAndLastName.html", title: "Get first and last name" },
- { url: "/html/getAccountPicture.html", title: "Get account picture" },
- { url: "/html/setAccountPicture.html", title: "Set account picture and listen for changes" }
- ];
-
- WinJS.Navigation.addEventListener("navigating", function (e) {
- if (e.detail && e.detail.state && e.detail.state.activatedEventArgs) {
- var uri = e.detail.state.activatedEventArgs[0].uri;
- if (uri && uri.schemeName === "ms-accountpictureprovider") {
- // This app was activated via the Account picture apps section in Settings.
- // Here you would do app-specific logic for providing the user with account picture selection UX
- setImmediate(function () {
- WinJS.Navigation.navigate(scenarios[3].url).done();
- });
- }
- }
- });
-
- WinJS.Namespace.define("SdkSample", {
- sampleTitle: sampleTitle,
- scenarios: new WinJS.Binding.List(scenarios)
- });
-})();
diff --git a/Samples/AccountPictureName/js/js/setAccountPicture.js b/Samples/AccountPictureName/js/js/setAccountPicture.js
deleted file mode 100644
index 12d0d68a48..0000000000
--- a/Samples/AccountPictureName/js/js/setAccountPicture.js
+++ /dev/null
@@ -1,102 +0,0 @@
-//// Copyright (c) Microsoft Corporation. All rights reserved
-
-(function () {
- "use strict";
- var page = WinJS.UI.Pages.define("/html/setAccountPicture.html", {
- ready: function (element, options) {
- hideVisibleHolders();
- document.getElementById("setImage").addEventListener("click", setImage, false);
- document.getElementById("setVideo").addEventListener("click", setVideo, false);
- Windows.System.UserProfile.UserInformation.addEventListener("accountpicturechanged", accountPictureChanged);
- }
- });
-
- function setImage() {
- hideVisibleHolders();
- var openPicker = new Windows.Storage.Pickers.FileOpenPicker();
- openPicker.viewMode = Windows.Storage.Pickers.PickerViewMode.thumbnail;
- openPicker.suggestedStartLocation = Windows.Storage.Pickers.PickerLocationId.picturesLibrary;
- openPicker.fileTypeFilter.replaceAll([".bmp", ".png", ".jpg", ".jpeg"]);
-
- openPicker.pickSingleFileAsync().done(function (file) {
- if (file) {
- // setAccountPictureAsync() accepts 3 storageFile objects for setting the small image, large image, and video.
- // More than one type can be set in the same call, but small image must be accompanied by a large image and/or video.
- // If only a large image is passed, the small image will be autogenerated.
- // If only a video is passed, the large image and small will be autogenerated.
- // Videos must be convertable to mp4, <=5MB, and height and width >= 448 pixels.
- Windows.System.UserProfile.UserInformation.setAccountPicturesAsync(null, file, null).done(function (result) {
- // A user might turn off access to the Account Picture in PC Settings, therefore we need to check the result for success.
- if (result === Windows.System.UserProfile.SetAccountPictureResult.success) {
- WinJS.log && WinJS.log("Successfully updated account picture.", "sample", "status");
- } else {
- // A user might turn off access to the account
- WinJS.log && WinJS.log("Setting account picture failed.", "sample", "status");
- }
- });
- } else {
- WinJS.log && WinJS.log("No image was selected.", "sample", "status");
- }
- });
- }
-
- function setVideo() {
- hideVisibleHolders();
- var openPicker = new Windows.Storage.Pickers.FileOpenPicker();
- openPicker.viewMode = Windows.Storage.Pickers.PickerViewMode.thumbnail;
- openPicker.suggestedStartLocation = Windows.Storage.Pickers.PickerLocationId.picturesLibrary;
- openPicker.fileTypeFilter.replaceAll([".mov", ".mp4", ".wmv"]);
-
- openPicker.pickSingleFileAsync().done(function (file) {
- if (file) {
- // setAccountPictureAsync() accepts 3 storageFile objects for setting the small image, large image, and video.
- // More than one type can be set in the same call, but small image must be accompanied by a large image and/or video.
- // If only a large image is passed, the small image will be autogenerated.
- // If only a video is passed, the large image and small will be autogenerated.
- // Videos must be convertable to mp4, <=5MB, and height and width >= 448 pixels.
- Windows.System.UserProfile.UserInformation.setAccountPicturesAsync(null, null, file).done(function (result) {
- // A user might turn off access to the Account Picture in PC Settings, therefore we need to check the result for success.
- if (result === Windows.System.UserProfile.SetAccountPictureResult.success) {
- WinJS.log && WinJS.log("Successfully updated account picture.", "sample", "status");
- } else {
- // A user might turn off access to the account
- WinJS.log && WinJS.log("Setting account picture failed.", "sample", "status");
- }
- });
- } else {
- WinJS.log && WinJS.log("No video was selected.", "sample", "status");
- }
- });
- }
-
- // This function is the handler for the AccountPictureChangedEvent, the event listener is added in initialize() below.
- function accountPictureChanged() {
- hideVisibleHolders();
- if (Windows.System.UserProfile.UserInformation.nameAccessAllowed) {
- var smallImage = Windows.System.UserProfile.UserInformation.getAccountPicture(Windows.System.UserProfile.AccountPictureKind.smallImage);
- if (smallImage) {
- document.getElementById("smallImageHolder").src = URL.createObjectURL(smallImage, { oneTimeOnly: true });
- document.getElementById("smallImageHolder").style.visibility = "visible";
- }
- var largeImage = Windows.System.UserProfile.UserInformation.getAccountPicture(Windows.System.UserProfile.AccountPictureKind.largeImage);
- if (largeImage) {
- document.getElementById("largeImageHolder").src = URL.createObjectURL(largeImage, { oneTimeOnly: true });
- document.getElementById("largeImageHolder").style.visibility = "visible";
- }
- var video = Windows.System.UserProfile.UserInformation.getAccountPicture(Windows.System.UserProfile.AccountPictureKind.video);
- if (video) {
- document.getElementById("videoHolder").src = URL.createObjectURL(video, { oneTimeOnly: true });
- document.getElementById("videoHolder").style.visibility = "visible";
- }
- } else {
- WinJS.log && WinJS.log("Access to account picture disabled by Privacy Setting or Group Policy.", "sample", "error");
- }
- }
-
- function hideVisibleHolders() {
- document.getElementById("smallImageHolder").style.visibility = "hidden";
- document.getElementById("largeImageHolder").style.visibility = "hidden";
- document.getElementById("videoHolder").style.visibility = "hidden";
- WinJS.log && WinJS.log(" ", "sample", "status");
- }
-})();
diff --git a/Samples/AccountPictureName/js/js/userDisplayName.js b/Samples/AccountPictureName/js/js/userDisplayName.js
deleted file mode 100644
index 040dbdfda3..0000000000
--- a/Samples/AccountPictureName/js/js/userDisplayName.js
+++ /dev/null
@@ -1,24 +0,0 @@
-//// Copyright (c) Microsoft Corporation. All rights reserved
-
-(function () {
- "use strict";
- var page = WinJS.UI.Pages.define("/html/userDisplayName.html", {
- ready: function (element, options) {
- document.getElementById("getDisplayName").addEventListener("click", getDisplayName, false);
- }
- });
-
- function getDisplayName() {
- if (Windows.System.UserProfile.UserInformation.nameAccessAllowed) {
- Windows.System.UserProfile.UserInformation.getDisplayNameAsync().done(function (result) {
- if (result) {
- WinJS.log && WinJS.log("Display name = " + result, "sample", "status");
- } else {
- WinJS.log && WinJS.log("No display name was returned.", "sample", "status");
- }
- });
- } else {
- WinJS.log && WinJS.log("Access to name disabled by Privacy Setting or Group Policy.", "sample", "error");
- }
- }
-})();
diff --git a/Samples/AccountPictureName/js/js/userFirstAndLastName.js b/Samples/AccountPictureName/js/js/userFirstAndLastName.js
deleted file mode 100644
index b2e2e66d10..0000000000
--- a/Samples/AccountPictureName/js/js/userFirstAndLastName.js
+++ /dev/null
@@ -1,39 +0,0 @@
-//// Copyright (c) Microsoft Corporation. All rights reserved
-
-(function () {
- "use strict";
- var page = WinJS.UI.Pages.define("/html/userFirstAndLastName.html", {
- ready: function (element, options) {
- document.getElementById("getFirstName").addEventListener("click", getFirstName, false);
- document.getElementById("getLastName").addEventListener("click", getLastName, false);
- }
- });
-
- function getFirstName() {
- if (Windows.System.UserProfile.UserInformation.nameAccessAllowed) {
- Windows.System.UserProfile.UserInformation.getFirstNameAsync().done(function (result) {
- if (result) {
- WinJS.log && WinJS.log("First name = " + result, "sample", "status");
- } else {
- WinJS.log && WinJS.log("No first name was returned.", "sample", "status");
- }
- });
- } else {
- WinJS.log && WinJS.log("Access to name disabled by Privacy Setting or Group Policy.", "sample", "error");
- }
- }
-
- function getLastName() {
- if (Windows.System.UserProfile.UserInformation.nameAccessAllowed) {
- Windows.System.UserProfile.UserInformation.getLastNameAsync().done(function (result) {
- if (result) {
- WinJS.log && WinJS.log("Last name = " + result, "sample", "status");
- } else {
- WinJS.log && WinJS.log("No last name was returned.", "sample", "status");
- }
- });
- } else {
- WinJS.log && WinJS.log("Access to name disabled by Privacy Setting or Group Policy.", "sample", "error");
- }
- }
-})();
diff --git a/Samples/AccountPictureName/shared/GetAccountPicture.xaml b/Samples/AccountPictureName/shared/GetAccountPicture.xaml
deleted file mode 100644
index 96bd210cb6..0000000000
--- a/Samples/AccountPictureName/shared/GetAccountPicture.xaml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
- Description:
-
-
- Get the First and Last Name for the current user. This is only available for Microsoft Accounts, an empty string will be returned if not available.
-
+
+
+
+
\ No newline at end of file
diff --git a/Samples/AccountPictureName/js/html/userDisplayName.html b/Samples/UserInfo/js/html/scenario2-watchUsers.html
similarity index 52%
rename from Samples/AccountPictureName/js/html/userDisplayName.html
rename to Samples/UserInfo/js/html/scenario2-watchUsers.html
index b04d02fff0..5058754575 100644
--- a/Samples/AccountPictureName/js/html/userDisplayName.html
+++ b/Samples/UserInfo/js/html/scenario2-watchUsers.html
@@ -7,7 +7,7 @@
+
+ Description:
+
+ Find users and display user properties.
+ In order to retrieve user properties, you must declare the userAccountInformation
+ capability in your application manifest.
+ In order to find multiple users, you must set <uap:SupportedUsers>multiple</uap:SupportedUsers>
+ in your application manifest.
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+ Description:
-
Get the DisplayName for the current user.
+ Maintain a list of users with a UserWatcher
-
+
diff --git a/Samples/AccountPictureName/js/images/placeholder.txt b/Samples/UserInfo/js/images/placeholder.txt
similarity index 100%
rename from Samples/AccountPictureName/js/images/placeholder.txt
rename to Samples/UserInfo/js/images/placeholder.txt
diff --git a/Samples/UserInfo/js/js/sample-configuration.js b/Samples/UserInfo/js/js/sample-configuration.js
new file mode 100644
index 0000000000..02578298f1
--- /dev/null
+++ b/Samples/UserInfo/js/js/sample-configuration.js
@@ -0,0 +1,17 @@
+//// Copyright (c) Microsoft Corporation. All rights reserved
+
+(function () {
+ "use strict";
+
+ var sampleTitle = "Account picture name JS sample";
+
+ var scenarios = [
+ { url: "/html/scenario1-findUsers.html", title: "Find users" },
+ { url: "/html/scenario2-watchUsers.html", title: "Watch users" },
+ ];
+
+ WinJS.Namespace.define("SdkSample", {
+ sampleTitle: sampleTitle,
+ scenarios: new WinJS.Binding.List(scenarios)
+ });
+})();
diff --git a/Samples/UserInfo/js/js/scenario1-findUsers.js b/Samples/UserInfo/js/js/scenario1-findUsers.js
new file mode 100644
index 0000000000..7b3e000c5c
--- /dev/null
+++ b/Samples/UserInfo/js/js/scenario1-findUsers.js
@@ -0,0 +1,131 @@
+//// Copyright (c) Microsoft Corporation. All rights reserved
+
+(function () {
+ "use strict";
+
+ var System = Windows.System;
+ var User = System.User;
+ var KnownUserProperties = System.KnownUserProperties;
+ var UserPictureSize = System.UserPictureSize;
+
+ var userTypeNames = [ "LocalUser", "RemoteUser", "LocalGuest", "RemoteGuest" ];
+ var authenticationStatusNames = [ "Unauthenticated", "LocallyAuthenticated", "RemotelyAuthenticated" ];
+
+ var nextUserNumber = 1;
+ var userList;
+ var resultsText;
+ var profileImage;
+
+ var page = WinJS.UI.Pages.define("/html/scenario1-findUsers.html", {
+ ready: function (element, options) {
+ userList = document.getElementById("userList");
+ resultsText = document.getElementById("resultsText");
+ profileImage = document.getElementById("profileImage");
+
+ document.getElementById("showPropertiesButton").addEventListener("click", showProperties, false);
+
+ return fillUsersAsync();
+ }
+ });
+
+ function fillUsersAsync() {
+ nextUserNumber = 1;
+ User.findAllAsync().then(function (users) {
+ return addNextUserAsync(0);
+
+ function addNextUserAsync(i) {
+ if (i < users.length) {
+ var user = users[i];
+ return user.getPropertyAsync(KnownUserProperties.displayName).then(function (displayName) {
+ // Choose a generic name if we do not have access to the actual name.
+ if (displayName == "") {
+ displayName = "User #" + nextUserNumber;
+ ++nextUserNumber;
+ }
+
+ var newOption = document.createElement("option");
+ newOption.text = displayName;
+ newOption.value = user.nonRoamableId;
+ newOption.selected = false;
+ userList.add(newOption);
+
+ return addNextUser(i + 1);
+ });
+ }
+ }
+ });
+ }
+
+ function showProperties() {
+ if (userList.selectedIndex >= 0) {
+ resultsText.innerText = "";
+ profileImage.src = "";
+ WinJS.log && WinJS.log("", "sample", "status");
+
+ var userId = userList[userList.selectedIndex].value;
+ try {
+ var user = User.getFromId(userId);
+ } catch (ex) {
+ WinJS.log && WinJS.log(ex.message, "sample", "error");
+ return;
+ }
+
+ // Build a list of all the properties we want.
+ var desiredProperties = [
+ KnownUserProperties.firstName,
+ KnownUserProperties.lastName,
+ KnownUserProperties.providerName,
+ KnownUserProperties.accountName,
+ KnownUserProperties.guestHost,
+ KnownUserProperties.principalName,
+ KnownUserProperties.domainName,
+ KnownUserProperties.sessionInitiationProtocolUri
+ ];
+
+ // Issue a bulk query for all of the properties above.
+ // NOTE: Bulk queries do not work from JS right now.
+ // user.getPropertiesAsync(desiredProperties).then(function (values) {
+ simulateGetPropertiesAsync(user, desiredProperties).then(function (values) {
+ // Generate the results.
+ var result = "NonRoamableId: " + user.nonRoamableId + "\n";
+ result += "Type: " + userTypeNames[user.type] + "\n";
+ result += "AuthenticationStatus: " + authenticationStatusNames[user.authenticationStatus] + "\n";
+ desiredProperties.forEach(function (propertyName) {
+ result += propertyName + ": "+ values[propertyName] + "\n";
+ });
+
+ resultsText.innerText = result;
+ }).then(function () {
+ return user.getPictureAsync(UserPictureSize.size64x64);
+ }).then(function (streamReference) {
+ return streamReference && streamReference.openReadAsync();
+ }).then(function (stream) {
+ if (stream) {
+ profileImage.src = URL.createObjectURL(stream, { oneTimeOnly: true });
+ // Close the stream once the image is loaded.
+ profileImage.onload = function () { stream.close(); };
+ }
+ });
+ }
+ }
+
+ // Bulk queries do not work from JS right now, so we simulate it by
+ // issuing a series of single-property queries.
+ function simulateGetPropertiesAsync(user, desiredProperties) {
+ var values = {};
+ return addNextPropertyAsync(0);
+
+ function addNextPropertyAsync(i) {
+ if (i < desiredProperties.length) {
+ var propertyName = desiredProperties[i];
+ return user.getPropertyAsync(propertyName).then(function (result) {
+ values[propertyName] = result;
+ return addNextPropertyAsync(i + 1);
+ });
+ } else {
+ return values;
+ }
+ }
+ }
+
+})();
diff --git a/Samples/UserInfo/js/js/scenario2-watchUsers.js b/Samples/UserInfo/js/js/scenario2-watchUsers.js
new file mode 100644
index 0000000000..0e01e27d72
--- /dev/null
+++ b/Samples/UserInfo/js/js/scenario2-watchUsers.js
@@ -0,0 +1,136 @@
+//// Copyright (c) Microsoft Corporation. All rights reserved
+
+(function () {
+ "use strict";
+
+ var System = Windows.System;
+ var User = System.User;
+ var KnownUserProperties = System.KnownUserProperties;
+
+ var startButton;
+ var stopButton;
+ var userList;
+
+ var nextUserNumber = 1;
+ var userWatcher;
+
+ var page = WinJS.UI.Pages.define("/html/scenario2-watchUsers.html", {
+ ready: function (element, options) {
+ startButton = document.getElementById("startButton");
+ stopButton = document.getElementById("stopButton");
+ userList = document.getElementById("userList");
+
+ startButton.addEventListener("click", startWatching, false);
+ stopButton.addEventListener("click", stopWatching, false);
+ },
+ unload: stopWatching
+ });
+
+ function startWatching() {
+ WinJS.log && WinJS.log("", "sample", "status");
+
+ nextUserNumber = 1;
+ userList.innerHTML = ""; // remove all children
+
+ userWatcher = User.createWatcher();
+ userWatcher.addEventListener("added", onUserAdded);
+ userWatcher.addEventListener("updated", onUserUpdated);
+ userWatcher.addEventListener("removed", onUserRemoved);
+ userWatcher.addEventListener("enumerationcompleted", onEnumerationCompleted);
+ userWatcher.addEventListener("stopped", onWatcherStopped);
+ userWatcher.start();
+ startButton.disabled = true;
+ stopButton.disabled = false;
+ }
+
+ function stopWatching() {
+ if (userWatcher) {
+ userWatcher.removeEventListener("added", onUserAdded);
+ userWatcher.removeEventListener("updated", onUserUpdated);
+ userWatcher.removeEventListener("removed", onUserRemoved);
+ userWatcher.removeEventListener("enumerationCompleted", onEnumerationCompleted);
+ userWatcher.removeEventListener("stopped", onWatcherStopped);
+ userWatcher.stop();
+ userWatcher = null;
+ userList.innerHTML = ""; // remove all children
+ startButton.disabled = false;
+ stopButton.disabled = true;
+ }
+ }
+
+ function findOptionByUserId(userId) {
+ // make it safe to put inside "..."
+ var sanitized = userId.replace("\\", "\\\\").replace("'", "\\'");
+ return userList.querySelector("option[value='" + sanitized + "']");
+ }
+
+ function getDisplayNameOrGenericNameAsync(user) {
+ return user.getPropertyAsync(KnownUserProperties.displayName).then(function (displayName) {
+ // Choose a generic name if we do not have access to the actual name.
+ if (displayName == "") {
+ displayName = "User #" + nextUserNumber;
+ ++nextUserNumber;
+ }
+ return displayName;
+ });
+ }
+
+ function onUserAdded(e) {
+ var user = e.user;
+
+ // Create the user with "..." as the temporary display name.
+ // Add it right away, because it might get removed while the
+ // getDisplayNameOrGenericNameAsync is running.
+
+ var newOption = document.createElement("option");
+ newOption.text = "\u2026";
+ newOption.value = user.nonRoamableId;
+ newOption.selected = false;
+ userList.add(newOption);
+
+ // Uncomment this line, and the behavior in the TODO changes!
+ // Instead of setting only the first character, it sets only the first word.
+ //newOption.text = "Bogga";
+
+ // Try to get the display name.
+ getDisplayNameOrGenericNameAsync(user).then(function (displayName) {
+ // TODO: Figure out why only the first character gets set.
+ newOption.text = displayName;
+ });
+ }
+
+ function onUserUpdated(e) {
+ var user = e.user;
+
+ // Look for the user in our collection and update the display name.
+ var option = findOptionByUserId(user.nonRoamableId);
+
+ // Try to update the display name.
+ getDisplayNameOrGenericNameAsync(user).then(function (displayName) {
+ // TODO: Figure out why only the first character gets set.
+ option.text = displayName;
+ });
+ }
+
+ function onUserRemoved(e) {
+ var user = e.user;
+
+ // Look for the user in our collection and remove it.
+ var option = findOptionByUserId(user.nonRoamableId);
+
+ if (option) {
+ userList.remove(option);
+ }
+ }
+
+ function onEnumerationCompleted()
+ {
+ WinJS.log && WinJS.log("Enumeration complete. Watching for changes...", "sample", "status");
+ }
+
+ function onWatcherStopped()
+ {
+ stopWatching();
+ }
+
+})();
diff --git a/Samples/AccountPictureName/js/sample-utils/placeholder.txt b/Samples/UserInfo/js/sample-utils/placeholder.txt
similarity index 100%
rename from Samples/AccountPictureName/js/sample-utils/placeholder.txt
rename to Samples/UserInfo/js/sample-utils/placeholder.txt
diff --git a/Samples/AccountPictureName/shared/GetUserFirstAndLastName.xaml b/Samples/UserInfo/shared/Scenario1_FindUsers.xaml
similarity index 61%
rename from Samples/AccountPictureName/shared/GetUserFirstAndLastName.xaml
rename to Samples/UserInfo/shared/Scenario1_FindUsers.xaml
index 37cc636fb0..4a76dacf6e 100644
--- a/Samples/AccountPictureName/shared/GetUserFirstAndLastName.xaml
+++ b/Samples/UserInfo/shared/Scenario1_FindUsers.xaml
@@ -11,7 +11,7 @@
//*********************************************************
-->
+
+
+
+