javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
vakrilov
2015-03-24 11:46:20 +02:00
parent a33b608ce4
commit 7abab509a8
4 changed files with 53 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CrossPlatformModules.csproj
View File

@@ -668,13 +668,6 @@
</TypeScriptCompile>
<Content Include="apps\TelerikNEXT\images\addfav.png" />
<Content Include="apps\TelerikNEXT\images\fav.png" />
<Content Include="apps\TelerikNEXT\main-page.css" />
<Content Include="apps\TelerikNEXT\images\jen.png" />
<Content Include="apps\TelerikNEXT\images\michael.png" />
<Content Include="apps\TelerikNEXT\images\sam.png" />
<Content Include="apps\TelerikNEXT\images\svetla.png" />
<Content Include="apps\TelerikNEXT\images\tj.png" />
<Content Include="apps\TelerikNEXT\images\todd.png" />
<Content Include="apps\TelerikNEXT\app.css" />
<Content Include="apps\TelerikNEXT\main-page.xml" />
<Content Include="apps\template-blank\package.json" />
@@ -1519,7 +1512,7 @@
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>
<UserProperties ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2linear-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" />
<UserProperties ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2linear-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" />
</VisualStudio>
</ProjectExtensions>
</Project>

14
apps/TelerikNEXT/app-view-model.ts
View File

@@ -64,7 +64,6 @@ function updateFavourites() {
localSettings.setString(FAVOURITES, newValue);
}
var el = new everlive("mzacGkKPFlZUfbMq");
var expandExp = {
"speakers": true
@@ -87,18 +86,18 @@ el.data('NextSessions').expand(expandExp).get().then(
}, function (error) {
dialogs.alert("Could not load sessions. Error: " + error);
}
);
);
export class AppViewModel extends observable.Observable {
public selectedViewIndex: number;
private _selectedIndex;
constructor() {
super();
this.selectedIndex = 0;
this.set("isLoading", true);
this.selectedViewIndex = 1;
this.set("isLoading", true);
}
private _sessions: Array<SessionModel>;
@@ -110,10 +109,6 @@ export class AppViewModel extends observable.Observable {
return this.sessions.filter(i=> { return i.favorite });
}
get speakers(): Array<Speaker> {
return speakers;
}
private _search = "";
get search(): string {
return this._search;
@@ -127,7 +122,6 @@ export class AppViewModel extends observable.Observable {
}
}
private _selectedIndex;
get selectedIndex(): number {
return this._selectedIndex;
}
@@ -162,6 +156,7 @@ export class AppViewModel extends observable.Observable {
public onDataLoaded() {
this.set("isLoading", false);
this.filter();
}
public selectView(args: observable.EventData) {
var btn = <button.Button>args.object;
@@ -178,7 +173,6 @@ export class AppViewModel extends observable.Observable {
this.notify({ object: this, eventName: observable.knownEvents.propertyChange, propertyName: "selectedViewIndex", value: this.selectedViewIndex });
}
}
}
export var appModel = new AppViewModel();

12
apps/TelerikNEXT/everlive-upload.ts
View File

@@ -1,9 +1,6 @@
import observable = require("data/observable");
import dialogs = require("ui/dialogs");
var everlive = require("./lib/everlive");
var everlive = require("./lib/everlive");
var el = new everlive("mzacGkKPFlZUfbMq");
var i = 0;
// UPLOAD Sessions
var sessionsStatic = [
@@ -331,7 +328,7 @@ var sessionsStatic = [
}];
var dataSessions = el.data('NextSessions');
for (var i = 0; i < sessionsStatic.length; i++) {
for (i = 0; i < sessionsStatic.length; i++) {
dataSessions.create(sessionsStatic[i],
function (data) {
console.log("session added: " + JSON.stringify(data));
@@ -341,7 +338,6 @@ for (var i = 0; i < sessionsStatic.length; i++) {
});
}
// UPLOAD SPEAKERS
var speakersStatic = [
{
@@ -406,7 +402,7 @@ var speakersStatic = [
}];
var data = el.data('NextSpeakers');
for (var i = 0; i < speakersStatic.length; i++) {
for (i = 0; i < speakersStatic.length; i++) {
data.create(speakersStatic[i],
function (data) {
console.log("speaker added: " + JSON.stringify(data));

88
apps/TelerikNEXT/main-page.xml
View File

@@ -29,61 +29,61 @@
<GridLayout rows="auto, auto, *" visibility="{{ selectedViewIndex !== 2 ? 'visible' : 'collapsed' }}">
<StackLayout style="background-image: url('~/app/images/background.jpg')">
<SegmentedBar selectedIndex="{{ selectedIndex }}" style="background-color: transparent;color: white;" selectedBackgroundColor="#fac950">
<SegmentedBar.items>
<SegmentedBarItem title="MAY 3" />
<SegmentedBarItem title="MAY 4" />
<SegmentedBarItem title="MAY 5" />
</SegmentedBar.items>
</SegmentedBar>
<StackLayout style="background-image: url('~/app/images/background.jpg')">
<SegmentedBar selectedIndex="{{ selectedIndex }}" style="background-color: transparent;color: white;" selectedBackgroundColor="#fac950">
<SegmentedBar.items>
<SegmentedBarItem title="MAY 3" />
<SegmentedBarItem title="MAY 4" />
<SegmentedBarItem title="MAY 5" />
</SegmentedBar.items>
</SegmentedBar>
<Label cssClass="page-title" horizontalAlignment="center" margin="15">
<Label.formattedText>
<FormattedString>
<FormattedString.spans>
<Span text="{{ dayHeader }}" fontAttributes="Bold" />
</FormattedString.spans>
</FormattedString>
</Label.formattedText>
</Label>
</StackLayout>
<SearchBar text="{{ search }}" hint="Search" style="background-color: #fac950; color: #fac950;" textFieldBackgroundColor="white" row="1" />
<ListView items="{{ sessions }}" row="2" separatorColor="#fac950" itemTap="selectSession">
<ListView.itemTemplate>
<GridLayout columns="auto, *" cssClass="{{ canBeFavorited ? 'list-view-row' : 'break-row' }}">
<Image src="{{ favorite ? '~/app/images/fav.png' : '~/app/images/addfav.png' }}"
visibility="{{ canBeFavorited ? 'visible' : 'collapsed' }}"
tap="toggleFavorite" cssClass="favourite-image" />
<StackLayout col="1">
<Label cssClass="info-orange">
<Label cssClass="page-title" horizontalAlignment="center" margin="15">
<Label.formattedText>
<FormattedString>
<FormattedString.spans>
<Span text="{{ range }}" fontAttributes="Bold" />
<Span text="{{ dayHeader }}" fontAttributes="Bold" />
</FormattedString.spans>
</FormattedString>
</Label.formattedText>
</Label>
<Label text="{{ title }}" textWrap="true" cssClass="info-bigger"/>
<Label visibility="{{ room ? 'visible' : 'collapsed' }}" text="{{ room }}" cssClass="info-orange" />
</StackLayout>
<SearchBar text="{{ search }}" hint="Search" style="background-color: #fac950; color: #fac950;" textFieldBackgroundColor="white" row="1" />
<ListView items="{{ sessions }}" row="2" separatorColor="#fac950" itemTap="selectSession">
<ListView.itemTemplate>
<GridLayout columns="auto, *" cssClass="{{ canBeFavorited ? 'list-view-row' : 'break-row' }}">
<Image src="{{ favorite ? '~/app/images/fav.png' : '~/app/images/addfav.png' }}"
visibility="{{ canBeFavorited ? 'visible' : 'collapsed' }}"
tap="toggleFavorite" cssClass="favourite-image" />
<StackLayout col="1">
<Label cssClass="info-orange">
<Label.formattedText>
<FormattedString>
<FormattedString.spans>
<Span text="{{ range }}" fontAttributes="Bold" />
</FormattedString.spans>
</FormattedString>
</Label.formattedText>
</Label>
<Label text="{{ title }}" textWrap="true" cssClass="info-bigger"/>
<Label visibility="{{ room ? 'visible' : 'collapsed' }}" text="{{ room }}" cssClass="info-orange" />
</StackLayout>
</GridLayout>
</ListView.itemTemplate>
</ListView>
<ActivityIndicator busy="{{ isLoading }}" row="2" horizontalAlignment="center" verticalAlignment="center" />
</GridLayout>
</ListView.itemTemplate>
</ListView>
<ActivityIndicator busy="{{ isLoading }}" row="2" horizontalAlignment="center" verticalAlignment="center" />
</GridLayout>
<Border style="background-color: #053140;" visibility="{{ selectedViewIndex === 2 ? 'visible' : 'collapsed' }}">
<Image src="~/app/images/logo.png" margin="20" />