Merge branch 'master' of github.com:Microsoft/TouchDevelop

This commit is contained in:
Michal Moskal 2015-04-23 11:08:45 -07:00
Родитель d16be3f866 c8876d1430
Коммит 403234718e
4 изменённых файлов: 13 добавлений и 12 удалений

Просмотреть файл

@ -1330,7 +1330,7 @@ module TDev.Browser {
elements.peek().appendChild(div("hubTileSearch", HTML.mkImg("svg:search,white")));
addFnBtn(lf("Create channel"), Ticks.hubCreateList,
() => { this.createList(); });
elements.peek().appendChild(div("hubTileSearch", HTML.mkImg("svg:script,white")));
elements.peek().appendChild(div("hubTileSearch", HTML.mkImg("svg:list,white")));
} else {
//if (items.length > 5)
// there is almost always more; the list will filter by capabilities, so it may seem short

Просмотреть файл

@ -2929,9 +2929,10 @@
var url = "http://tdev.ly/" + id;
var text = this.twitterMessage();
var r = div("sdAuthorLabel", HTML.mkImg("svg:Package,#000,clip=100"), lf("share")).withClick(() => {
TDev.RT.ShareManager.shareLinkAsync(TDev.RT.Web.link_url(text, url), "");
});
var btns = ["email", "twitter", "facebook"].map(network =>
div("sdAuthorLabel", HTML.mkImg("svg:" + network + ",#888,clip=100")).withClick(() => { TDev.RT.ShareManager.shareLinkAsync(TDev.RT.Web.link_url(text, url), network) })
);
var r = div('', btns);
return r;
}
}
@ -9466,7 +9467,7 @@
public inlineIsTile() { return false; }
public getId() { return "scripts"; }
public getName() { return lf("scripts"); }
public bgIcon() { return "svg:script"; }
public bgIcon() { return "svg:list"; }
public noneText() { return lf("no scripts for this channel"); }
public tabBox(c: JsonScript): HTMLElement {

Просмотреть файл

@ -97,13 +97,11 @@ module TDev.RT {
var encodedText = encodeURIComponent(text);
var encodedName = encodeURIComponent(link.name());
var encodedAddress = encodeURIComponent(link.address());
function shareEmail() { window.open('mailto:?subject=' + encodedName + '&body=' + encodedAddress); }
function shareTweet() { window.open('https://twitter.com/intent/tweet?text=' + encodedText); }
function shareFacebookLike() { window.open('http://www.facebook.com/plugins/like.php?send=false&layout=standard&width=200&show_faces=false&font&colorscheme=light&action=like&height=35&href=' + encodedAddress); }
function shareFacebook() {
window.open('https://www.facebook.com/sharer/sharer.php?u=' + encodedAddress,
'facebook-share-dialog',
'width=626,height=436'); }
var features = "menubar=no,status=no,titlebar=no,location=no,scrollbars=no,toolbar=no,width=500,height=550";
function shareEmail() { window.open('mailto:?subject=' + encodedName + '&body=' + encodedAddress, 'share', features); }
function shareTweet() { window.open('https://twitter.com/intent/tweet?text=' + encodedText, 'share', features); }
function shareFacebookLike() { window.open('http://www.facebook.com/plugins/like.php?send=false&layout=standard&width=200&show_faces=false&font&colorscheme=light&action=like&height=35&href=' + encodedAddress, 'share', features); }
function shareFacebook() { window.open('https://www.facebook.com/sharer/sharer.php?u=' + encodedAddress, 'share', features); }
if (options.tickCallback) options.tickCallback(network)

Просмотреть файл

@ -171,6 +171,8 @@ export module SVG {
"cloud": "M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z ",
"laptop": "M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z",
"expand": "M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z",
"list": "M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z",
"share": "M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z",
};
export function svgBoilerPlate(viewPort:string, svg:string, iconName = "")