mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

update toast

Browse source
This commit is contained in:
Luke Pulverenti 2016-02-25 01:38:12 -05:00
parent b3d91930d3
commit 91cedefe29
39 changed files with 165 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -15,12 +15,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.0.95",
"_release": "1.0.95",
"version": "1.0.96",
"_release": "1.0.96",
"_resolution": {
"type": "version",
"tag": "1.0.95",
"commit": "42219487ac4733e83807f9995433ec8485ad1c65"
"tag": "1.0.96",
"commit": "b77e4d74466f5960adc27e2cb7b55ef3d22f14dd"
},
"_source": "git://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "~1.0.0",

6
dashboard-ui/bower_components/emby-webcomponents/toast/toast.js vendored
View file

@ -4,6 +4,12 @@ define(['paper-toast'], function () {
return function (options) {
if (typeof options === 'string') {
options = {
text: options
};
}
var elem = document.createElement("paper-toast");
elem.setAttribute('text', options.text);
elem.id = 'toast' + (toastId++);

4
dashboard-ui/bower_components/paper-behaviors/.bower.json vendored
View file

@ -45,7 +45,7 @@
"tag": "v1.0.11",
"commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5"
},
"_source": "git://github.com/PolymerElements/paper-behaviors.git",
"_source": "git://github.com/polymerelements/paper-behaviors.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/paper-behaviors"
"_originalSource": "polymerelements/paper-behaviors"
}

6
dashboard-ui/bower_components/paper-ripple/.bower.json vendored
View file

@ -32,14 +32,14 @@
"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
},
"ignore": [],
"homepage": "https://github.com/PolymerElements/paper-ripple",
"homepage": "https://github.com/polymerelements/paper-ripple",
"_release": "1.0.5",
"_resolution": {
"type": "version",
"tag": "v1.0.5",
"commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5"
},
"_source": "git://github.com/PolymerElements/paper-ripple.git",
"_source": "git://github.com/polymerelements/paper-ripple.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/paper-ripple"
"_originalSource": "polymerelements/paper-ripple"
}

4
dashboard-ui/components/collectioneditor/collectioneditor.js
View file

@ -73,7 +73,9 @@
paperDialogHelper.close(dlg);
Dashboard.alert(Globalize.translate('MessageItemsAdded'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageItemsAdded'));
});
});
}

8
dashboard-ui/components/imageuploader/imageuploader.js
View file

@ -11,12 +11,16 @@
switch (evt.target.error.code) {
case evt.target.error.NOT_FOUND_ERR:
Dashboard.alert(Globalize.translate('MessageFileNotFound'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageFileNotFound'));
});
break;
case evt.target.error.ABORT_ERR:
break; // noop
default:
Dashboard.alert(Globalize.translate('MessageFileReadError'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageFileReadError'));
});
break;
};
}

4
dashboard-ui/components/itemidentifier/itemidentifier.js
View file

@ -48,7 +48,9 @@
});
if (!hasId && !lookupInfo.Name) {
Dashboard.alert(Globalize.translate('MessagePleaseEnterNameOrId'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessagePleaseEnterNameOrId'));
});
return;
}

4
dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
View file

@ -31,7 +31,9 @@
}, function () {
Dashboard.alert(Globalize.translate('ErrorAddingMediaPathToVirtualFolder'));
require(['toast'], function (toast) {
toast(Globalize.translate('ErrorAddingMediaPathToVirtualFolder'));
});
});
return false;

8
dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
View file

@ -17,7 +17,9 @@
}, function () {
Dashboard.alert(Globalize.translate('ErrorAddingMediaPathToVirtualFolder'));
require(['toast'], function (toast) {
toast(Globalize.translate('ErrorAddingMediaPathToVirtualFolder'));
});
});
}
@ -43,7 +45,9 @@
}, function () {
Dashboard.alert(Globalize.translate('DefaultErrorMessage'));
require(['toast'], function (toast) {
toast(Globalize.translate('DefaultErrorMessage'));
});
});
});
});

4
dashboard-ui/components/metadataeditor/metadataeditor.js
View file

@ -15,7 +15,9 @@
function afterContentTypeUpdated() {
Dashboard.alert(Globalize.translate('MessageItemSaved'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageItemSaved'));
});
Dashboard.hideLoadingMsg();
closeDialog(true);

4
dashboard-ui/components/playlisteditor/playlisteditor.js
View file

@ -74,7 +74,9 @@
Dashboard.hideLoadingMsg();
paperDialogHelper.close(dlg);
Dashboard.alert(Globalize.translate('MessageAddedToPlaylistSuccess'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageAddedToPlaylistSuccess'));
});
});
}

4
dashboard-ui/components/recordingcreator/recordingcreator.js
View file

@ -358,7 +358,9 @@
dlg.addEventListener('iron-overlay-closed', function () {
if (recordingCreated) {
Dashboard.alert(Globalize.translate('MessageRecordingScheduled'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageRecordingScheduled'));
});
resolve();
} else {
reject();

8
dashboard-ui/components/remotecontrol.js
View file

@ -759,7 +759,9 @@
}, currentPlayer);
$('input', form).val('');
Dashboard.alert('Message sent.');
require(['toast'], function (toast) {
toast('Message sent.');
});
e.preventDefault();
e.stopPropagation();
@ -780,7 +782,9 @@
}, currentPlayer);
$('input', form).val('');
Dashboard.alert('Text sent.');
require(['toast'], function (toast) {
toast('Text sent.');
});
e.preventDefault();
e.stopPropagation();

4
dashboard-ui/components/subtitleeditor/subtitleeditor.js
View file

@ -56,7 +56,9 @@
}).then(function () {
Dashboard.alert(Globalize.translate('MessageDownloadQueued'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageDownloadQueued'));
});
});
}

2
dashboard-ui/devices/ios/ios.css
View file

@ -244,5 +244,5 @@ div.cardBox {
}
.videoSubtitles {
font-size: 300%;
font-size: 240%;
}

7
dashboard-ui/scripts/chromecast.js
View file

@ -276,13 +276,6 @@
console.log("chromecast launch error");
this.deviceState = DEVICE_STATE.ERROR;
//Dashboard.alert({
// title: Globalize.translate("Error"),
// message: Globalize.translate("ErrorLaunchingChromecast")
//});
sendConnectionResult(false);
};

4
dashboard-ui/scripts/dlnaprofile.js
View file

@ -866,7 +866,9 @@
contentType: "application/json"
}).then(function () {
Dashboard.alert('Settings saved.');
require(['toast'], function (toast) {
toast('Settings saved.');
});
});
} else {

4
dashboard-ui/scripts/itemdetailpage.js
View file

@ -1959,7 +1959,9 @@
ApiClient.cancelLiveTvTimer(id).then(function () {
Dashboard.alert(Globalize.translate('MessageRecordingCancelled'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageRecordingCancelled'));
});
reload(page);
});

4
dashboard-ui/scripts/librarybrowser.js
View file

@ -854,7 +854,9 @@
});
Dashboard.alert(Globalize.translate('MessageRefreshQueued'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageRefreshQueued'));
});
},
deleteItems: function (itemIds) {

8
dashboard-ui/scripts/livetvseriestimer.js
View file

@ -13,7 +13,9 @@
ApiClient.cancelLiveTvTimer(id).then(function () {
Dashboard.hideLoadingMsg();
Dashboard.alert(Globalize.translate('MessageRecordingCancelled'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageRecordingCancelled'));
});
reload(page);
});
@ -116,7 +118,9 @@
ApiClient.updateLiveTvSeriesTimer(item).then(function () {
Dashboard.hideLoadingMsg();
Dashboard.alert(Globalize.translate('MessageRecordingSaved'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageRecordingSaved'));
});
});
});

4
dashboard-ui/scripts/livetvseriestimers.js
View file

@ -16,7 +16,9 @@
ApiClient.cancelLiveTvSeriesTimer(id).then(function () {
Dashboard.alert(Globalize.translate('MessageSeriesCancelled'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageSeriesCancelled'));
});
reload(page);
});

8
dashboard-ui/scripts/livetvtimer.js
View file

@ -12,7 +12,9 @@
ApiClient.cancelLiveTvTimer(id).then(function () {
Dashboard.alert(Globalize.translate('MessageRecordingCancelled'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageRecordingCancelled'));
});
Dashboard.navigate('livetv.html');
});
@ -78,7 +80,9 @@
ApiClient.updateLiveTvTimer(item).then(function () {
Dashboard.hideLoadingMsg();
Dashboard.alert(Globalize.translate('MessageRecordingSaved'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageRecordingSaved'));
});
});
});

4
dashboard-ui/scripts/livetvtimers.js
View file

@ -10,7 +10,9 @@
ApiClient.cancelLiveTvTimer(id).then(function () {
Dashboard.alert(Globalize.translate('MessageRecordingCancelled'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageRecordingCancelled'));
});
reload(page);
});

4
dashboard-ui/scripts/loginpage.js
View file

@ -121,7 +121,9 @@
Dashboard.hideLoadingMsg();
setTimeout(function () {
Dashboard.alert(Globalize.translate('MessageInvalidUser'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageInvalidUser'));
});
}, 300);
});

4
dashboard-ui/scripts/mypreferencesdisplay.js
View file

@ -42,7 +42,9 @@
Dashboard.hideLoadingMsg();
if (!AppInfo.enableAutoSave) {
Dashboard.alert(Globalize.translate('SettingsSaved'));
require(['toast'], function (toast) {
toast(Globalize.translate('SettingsSaved'));
});
}
}, function () {

4
dashboard-ui/scripts/mypreferenceshome.js
View file

@ -224,7 +224,9 @@
Dashboard.hideLoadingMsg();
if (!AppInfo.enableAutoSave) {
Dashboard.alert(Globalize.translate('SettingsSaved'));
require(['toast'], function (toast) {
toast(Globalize.translate('SettingsSaved'));
});
}
}, function () {

4
dashboard-ui/scripts/mypreferenceslanguages.js
View file

@ -123,7 +123,9 @@
Dashboard.hideLoadingMsg();
if (!AppInfo.enableAutoSave) {
Dashboard.alert(Globalize.translate('SettingsSaved'));
require(['toast'], function (toast) {
toast(Globalize.translate('SettingsSaved'));
});
}
}, function () {

31
dashboard-ui/scripts/myprofile.js
View file

@ -80,15 +80,24 @@
switch (evt.target.error.code) {
case evt.target.error.NOT_FOUND_ERR:
Dashboard.alert(Globalize.translate('FileNotFound'));
require(['toast'], function (toast) {
toast(Globalize.translate('FileNotFound'));
});
break;
case evt.target.error.NOT_READABLE_ERR:
Dashboard.alert(Globalize.translate('FileReadError'));
require(['toast'], function (toast) {
toast(Globalize.translate('FileReadError'));
});
break;
case evt.target.error.ABORT_ERR:
break; // noop
default:
Dashboard.alert(Globalize.translate('FileReadError'));
{
require(['toast'], function (toast) {
toast(Globalize.translate('FileReadError'));
});
break;
}
};
}
@ -100,7 +109,9 @@
function onFileReaderAbort(evt) {
Dashboard.hideLoadingMsg();
Dashboard.alert(Globalize.translate('FileReadCancelled'));
require(['toast'], function (toast) {
toast(Globalize.translate('FileReadCancelled'));
});
}
function setFiles(page, files) {
@ -300,7 +311,9 @@
Dashboard.hideLoadingMsg();
Dashboard.alert(Globalize.translate('MessageSettingsSaved'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageSettingsSaved'));
});
loadUser(page);
});
});
@ -317,7 +330,9 @@
Dashboard.hideLoadingMsg();
Dashboard.alert(Globalize.translate('PasswordSaved'));
require(['toast'], function (toast) {
toast(Globalize.translate('PasswordSaved'));
});
loadUser(page);
}, function() {
@ -343,7 +358,9 @@
if ($('#txtNewPassword', page).val() != $('#txtNewPasswordConfirm', page).val()) {
Dashboard.alert(Globalize.translate('PasswordMatchError'));
require(['toast'], function (toast) {
toast(Globalize.translate('PasswordMatchError'));
});
} else {
Dashboard.showLoadingMsg();

4
dashboard-ui/scripts/mysync.js
View file

@ -27,7 +27,9 @@
require(['localsync'], function () {
LocalSync.sync();
Dashboard.alert(Globalize.translate('MessageSyncStarted'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageSyncStarted'));
});
refreshSyncStatus(page);
});
}

4
dashboard-ui/scripts/mysyncsettings.js
View file

@ -34,7 +34,9 @@
}));
Dashboard.hideLoadingMsg();
Dashboard.alert(Globalize.translate('SettingsSaved'));
require(['toast'], function (toast) {
toast(Globalize.translate('SettingsSaved'));
});
}
function onSubmit() {

8
dashboard-ui/scripts/site.js
View file

@ -511,14 +511,18 @@ var Dashboard = {
Dashboard.hideLoadingMsg();
Dashboard.alert(Globalize.translate('MessageSettingsSaved'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageSettingsSaved'));
});
},
processServerConfigurationUpdateResult: function (result) {
Dashboard.hideLoadingMsg();
Dashboard.alert(Globalize.translate('MessageSettingsSaved'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageSettingsSaved'));
});
},
alert: function (options) {

16
dashboard-ui/scripts/supporterkeypage.js
View file

@ -83,9 +83,13 @@
var result = JSON.parse(res);
Dashboard.hideLoadingMsg();
if (result.Success) {
Dashboard.alert(Globalize.translate('MessageKeysLinked'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageKeysLinked'));
});
} else {
Dashboard.alert(result.ErrorMessage);
require(['toast'], function (toast) {
toast(result.ErrorMessage);
});
}
console.log(result);
@ -107,9 +111,13 @@
var result = JSON.parse(res);
Dashboard.hideLoadingMsg();
if (result.Success) {
Dashboard.alert(Globalize.translate('MessageKeyEmailedTo').replace("{0}", email));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageKeyEmailedTo').replace("{0}", email));
});
} else {
Dashboard.alert(result.ErrorMessage);
require(['toast'], function (toast) {
toast(result.ErrorMessage);
});
}
console.log(result);

8
dashboard-ui/scripts/sync.js
View file

@ -20,7 +20,9 @@
if (!target) {
Dashboard.alert(Globalize.translate('MessagePleaseSelectDeviceToSyncTo'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessagePleaseSelectDeviceToSyncTo'));
});
return;
}
@ -52,7 +54,9 @@
}).then(function () {
paperDialogHelper.close(dlg);
Dashboard.alert(Globalize.translate('MessageSyncJobCreated'));
require(['toast'], function (toast) {
toast(Globalize.translate('MessageSyncJobCreated'));
});
});
}

4
dashboard-ui/scripts/syncjob.js
View file

@ -360,7 +360,9 @@
}).then(function () {
Dashboard.hideLoadingMsg();
Dashboard.alert(Globalize.translate('SettingsSaved'));
require(['toast'], function (toast) {
toast(Globalize.translate('SettingsSaved'));
});
});
});
});

4
dashboard-ui/scripts/useredit.js
View file

@ -150,7 +150,9 @@
var enteredConnectUsername = $('#txtConnectUserName', page).val();
if (currentConnectUsername == enteredConnectUsername) {
Dashboard.alert(Globalize.translate('SettingsSaved'));
require(['toast'], function (toast) {
toast(Globalize.translate('SettingsSaved'));
});
} else {
updateUserInfo(user, $('#txtConnectUserName', page).val(), function () {

4
dashboard-ui/scripts/userlibraryaccess.js
View file

@ -115,7 +115,9 @@
Dashboard.hideLoadingMsg();
Dashboard.alert(Globalize.translate('SettingsSaved'));
require(['toast'], function (toast) {
toast(Globalize.translate('SettingsSaved'));
});
}
function saveUser(user, page) {

4
dashboard-ui/scripts/usernew.js
View file

@ -116,7 +116,9 @@
});
} else {
Dashboard.alert(Globalize.translate('DefaultErrorMessage'));
require(['toast'], function (toast) {
toast(Globalize.translate('DefaultErrorMessage'));
});
}
Dashboard.hideLoadingMsg();

4
dashboard-ui/scripts/userparentalcontrol.js
View file

@ -191,7 +191,9 @@
Dashboard.hideLoadingMsg();
Dashboard.alert(Globalize.translate('SettingsSaved'));
require(['toast'], function (toast) {
toast(Globalize.translate('SettingsSaved'));
});
}
function saveUser(user, page) {

4
dashboard-ui/voice/commands/playcommands.js
View file

@ -21,8 +21,8 @@ define([], function () {
});
}
else {
Dashboard.alert({
message: Globalize.translate('MessageNoItemsFound')
require(['toast'], function (toast) {
toast(Globalize.translate('MessageNoItemsFound'));
});
}
}