Fayde loading progress

gulpfile.js

@@ -1,60 +1,58 @@
-var gulp = require('gulp'),
- taskListing = require('gulp-task-listing'),
- fs = require('fs'),
- typings = require('bower-typings'),
- allTypings = typings(),
- name = 'fayde',
- meta = {
- name: name,
- src: [
- 'typings/*.d.ts',
- 'src/_Version.ts',
- 'src/perf/**/*.ts',
- 'src/polyfill/**/*.ts',
- 'src/_Types.ts',
- 'src/**/*.ts'
- ].concat(typings({includeSelf: false})),
- scaffolds: [
- {
- name: 'test',
- symdirs: ['dist', 'src', 'themes'],
- src: [
- 'typings/*.d.ts',
- 'test/**/*.ts',
- '!test/lib/**/*.ts',
- 'dist/' + name + '.d.ts'
- ].concat(allTypings)
- },
- {
- name: 'testsite',
- ignore: 'lib/qunit',
- port: 7001,
- symdirs: ['dist', 'src', 'themes'],
- src: [
- 'typings/*.d.ts',
- 'testsite/**/*.ts',
- '!testsite/lib/**/*.ts',
- 'dist/' + name + '.d.ts'
- ].concat(allTypings)
- },
- {
- name: 'stress',
- ignore: 'lib/qunit',
- port: 7002,
- symdirs: ['dist', 'src', 'themes'],
- src: [
- 'typings/*.d.ts',
- 'stress/**/*.ts',
- '!stress/lib/**/*.ts',
- 'dist/' + name + '.d.ts'
- ].concat(allTypings)
- }
- ]
- };
-
-gulp.task('help', taskListing);
-
-fs.readdirSync('./gulp')
- .forEach(function (file) {
- require('./gulp/' + file)(meta);
- });
+var gulp = require('gulp'),
+ taskListing = require('gulp-task-listing'),
+ fs = require('fs'),
+ typings = require('bower-typings'),
+ allTypings = typings(),
+ name = 'fayde',
+ meta = {
+ name: name,
+ src: [
+ 'typings/*.d.ts',
+ 'src/_Version.ts',
+ 'src/perf/**/*.ts',
+ 'src/polyfill/**/*.ts',
+ 'src/_Types.ts',
+ 'src/**/*.ts'
+ ].concat(typings({
+ includeSelf: false
+ })),
+ scaffolds: [{
+ name: 'test',
+ symdirs: ['dist', 'src', 'themes'],
+ src: [
+ 'typings/*.d.ts',
+ 'test/**/*.ts',
+ '!test/lib/**/*.ts',
+ 'dist/' + name + '.d.ts'
+ ].concat(allTypings)
+ }, {
+ name: 'testsite',
+ ignore: 'lib/qunit',
+ port: 7001,
+ symdirs: ['dist', 'src', 'themes'],
+ src: [
+ 'typings/*.d.ts',
+ 'testsite/**/*.ts',
+ '!testsite/lib/**/*.ts',
+ 'dist/' + name + '.d.ts'
+ ].concat(allTypings)
+ }, {
+ name: 'stress',
+ ignore: 'lib/qunit',
+ port: 7002,
+ symdirs: ['dist', 'src', 'themes'],
+ src: [
+ 'typings/*.d.ts',
+ 'stress/**/*.ts',
+ '!stress/lib/**/*.ts',
+ 'dist/' + name + '.d.ts'
+ ].concat(allTypings)
+ }]
+ };
+
+gulp.task('help', taskListing);
+
+fs.readdirSync('./gulp')
+ .forEach(function(file) {
+ require('./gulp/' + file)(meta);
+ });

src/Controls/Border.ts

@@ -49,4 +49,4 @@ module Fayde.Controls {
  upd.updateBounds();
  upd.invalidateMeasure();
  }, false, false);
-}
+}

src/Controls/TextBoxBase.ts

@@ -13,7 +13,6 @@ module Fayde.Controls {
  static SelectionStartProperty = DependencyProperty.RegisterFull("SelectionStart", () => Number, TextBoxBase, 0, undefined, undefined, true, positiveIntValidator);
  static BaselineOffsetProperty = DependencyProperty.Register("BaselineOffset", () => Number, TextBoxBase);
  static MaxLengthProperty = DependencyProperty.RegisterFull("MaxLength", () => Number, TextBoxBase, 0, undefined, undefined, undefined, positiveIntValidator);
- static SelectionOnFocusProperty = DependencyProperty.Register("SelectionOnFocus", () => new Enum(SelectionOnFocus), TextBoxBase, SelectionOnFocus.Default);
 
  CaretBrush: Media.Brush;
  SelectionForeground: Media.Brush;
@@ -248,6 +247,8 @@ module Fayde.Controls {
  switch (args.Key) {
  case Key.A:
  //Ctrl+A => Select All
+ if (isReadOnly)
+ break;
  handled = true;
  proxy.selectAll();
  break;
@@ -280,10 +281,10 @@ module Fayde.Controls {
  break;
  case Key.Z:
  //Ctrl+Z => Undo
- if (!isReadOnly) {
- handled = true;
-  proxy.undo();
- }
+ if (isReadOnly)
+ break;
+ handled = true;
+ proxy.undo();
  break;
  }
  }

src/Controls/Video.ts

@@ -0,0 +1,96 @@
+module Fyade.Controls {
+ import Input = Fayde.Input;
+ import Control = Fayde.Controls.Control;
+ import Media = Fayde.Media;
+ import DependencyObject = Fayde.DependencyObject;
+ import MediaElement = Fayde.Controls.MediaElement;
+ import Uri = Fayde.Uri;
+ import Enum = Fayde.Enum;
+ import Button = Fayde.Controls.Button;
+ import ProgressBar = Fayde.Controls.ProgressBar;
+ import DpReaction = Fayde.DPReaction;
+
+ export class Video extends Control {
+ private Media: MediaElement;
+ private PlayButton: Button;
+ private PauseButton: Button;
+ private PlayProgress: ProgressBar;
+ private BufferProgress: ProgressBar;
+
+ private static _SourceCoercer(d: DependencyObject, propd: DependencyProperty, value: any): any {
+ if (typeof value === "string")
+ return new Media.Videos.VideoSource(new Uri(value));
+ if (value instanceof Uri)
+ return new Media.Videos.VideoSource(value);
+ return value;
+ }
+
+ static SourceProperty = DependencyProperty.RegisterFull("Source", () => Media.Videos.VideoSource, Video, undefined, undefined, Video._SourceCoercer);
+ static StretchProperty = DependencyProperty.RegisterCore("Stretch", () => new Enum(Media.Stretch), Video, Media.Stretch.Uniform);
+ Source: Media.Videos.VideoSource;
+ Stretch: Media.Stretch;
+
+ constructor() {
+ super();
+ this.DefaultStyleKey = Video;
+ }
+
+ OnApplyTemplate() {
+ super.OnApplyTemplate();
+ this.Media = <MediaElement>this.GetTemplateChild("PARTVideo", MediaElement);
+ this.PlayButton = <Button>this.GetTemplateChild("PARTPlayButton", Button);
+ this.PauseButton = <Button>this.GetTemplateChild("PARTPauseButton", Button);
+ this.PlayProgress = <ProgressBar>this.GetTemplateChild("PARTPlayProgress", ProgressBar);
+ this.BufferProgress = <ProgressBar>this.GetTemplateChild("PARTBufferProgress", ProgressBar);
+
+ if (this.PlayButton)
+ this.PlayButton.Command = new Fayde.MVVM.RelayCommand(par => this.PlayClicked(par));
+ if (this.PauseButton)
+ this.PauseButton.Command = new Fayde.MVVM.RelayCommand(par => this.PauseClicked(par));
+ }
+
+ OnMouseEnter(e: Input.MouseEventArgs) {
+ super.OnMouseEnter(e);
+ this.UpdateVisualState();
+ }
+
+ OnMouseLeave(e: Input.MouseEventArgs) {
+ super.OnMouseLeave(e);
+ this.UpdateVisualState();
+ }
+
+ PlayClicked(par: any) {
+ this.Media.Play();
+ }
+
+ PauseClicked(par: any) {
+ this.Media.Pause();
+ }
+
+ SetSource(value: any) {
+ this.Source = value;
+ }
+ }
+
+ Fayde.CoreLibrary.add(Video);
+
+ Fayde.Controls.TemplateVisualStates(Video,
+ { GroupName: "CommonStates", Name: "Normal" },
+ { GroupName: "CommonStates", Name: "MouseOver" },
+ { GroupName: "CommonStates", Name: "Disabled" });
+
+ Fayde.Controls.TemplateParts(Video,
+ { Name: "PARTMedia", Type: MediaElement },
+ { Name: "PARTPlayButton", Type: Button },
+ { Name: "PARTPauseButton", Type: Button },
+ { Name: "PARTPlayProgress", Type: ProgressBar },
+ { Name: "PARTBufferProgress", Type: ProgressBar });
+
+ DpReaction<Media.Videos.VideoSource>(Video.SourceProperty, (vid: Video, ov, nv) => {
+ vid.SetSource(nv);
+ }, false);
+
+ DpReaction<minerva.Stretch>(Video.StretchProperty, (vid: Video, ov, nv) => {
+ vid.Stretch = nv;
+ }, false);
+}

src/Controls/WebBrowser.ts

@@ -0,0 +1,14 @@
+module Fayde.Controls {
+ export class WebBrowser extends Controls.Control {
+
+ HTML
+
+ constructor() {
+ super();
+ }
+
+
+ }
+
+ Fayde.CoreLibrary.add(WebBrowser);
+}

src/Engine/InputManager.ts

@@ -58,7 +58,7 @@ module Fayde.Engine {
  }
 
  SetIsUserInitiatedEvent(value: boolean) {
- this._Focus.EmitChanges()
+ this._Focus.EmitChanges();
  this._State.IsFirstUserInitiated = this._State.IsFirstUserInitiated || value;
  this._State.IsUserInitiated = value;
  }

src/Runtime/Bootstrap.ts

@@ -58,6 +58,13 @@ module Fayde {
  loaded();
  }
 
+ function closeProgress() {
+ var progressId = document.body.getAttribute("fayde-progress");
+ if (progressId) {
+ document.body.removeChild(document.getElementById(progressId));
+ }
+ }
+
  function loaded() {
  onLoaded && onLoaded(app);
  perfex.phases.start('Running');
@@ -67,6 +74,7 @@ module Fayde {
  .then(getApp, finishError)
  .then(resolveTheme, finishError)
  .then(resolveApp, finishError)
- .then(startApp, finishError);
+ .then(startApp, finishError)
+ .then(closeProgress, finishError);
  }
 }

testsite/IssueTests/TextViewModel.ts

@@ -1,7 +1,7 @@
-class TextViewModel extends Fayde.MVVM.ViewModelBase {
- OnTextChanged(args: Fayde.IEventBindingArgs<Fayde.RoutedEventArgs>) {
- var tb = <Fayde.Controls.TextBox>args.sender;
- console.log("Text Changed", tb.Text);
- }
-}
+class TextViewModel extends Fayde.MVVM.ViewModelBase {
+ OnTextChanged(args: Fayde.IEventBindingArgs<Fayde.RoutedEventArgs>) {
+ var tb = <Fayde.Controls.TextBox>args.sender;
+ console.log("Text Changed", tb.Text);
+ }
+}
 export = TextViewModel;

testsite/Overlay/basic.fap

@@ -7,8 +7,8 @@
  <ToggleButton x:Name="Overlay1Toggle" Content="Open Overlay" />
  <Overlay IsOpen="{Binding ElementName=Overlay1Toggle, Path=IsChecked, Mode=TwoWay}">
  <Overlay.Visual>
- <Border HorizontalAlignment="Center" VerticalAlignment="Center" Background="Yellow"
- Width="300" Height="300">
+ <Border HorizontalAlignment="Stretch" VerticalAlignment="Center" Background="Yellow"
+ Height="300">
  <TextBlock Text="Hi! I am an overlay." />
  </Border>
  </Overlay.Visual>

testsite/videos/video.fap

@@ -0,0 +1,11 @@
+<Application
+ xmlns="http://schemas.wsick.com/fayde"
+ xmlns:x="http://schemas.wsick.com/fayde/x"
+ xmlns:c="videos"
+ ThemeName="Metro">
+ <Grid x:Name="LayoutRoot">
+ <Video Source="http://localhost:7001/videos/test_movie.mp4"
+ Grid.Row="0"
+ x:Name="Video" />
+ </Grid>
+</Application>