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

encapsulate path substitution

Browse source
This commit is contained in:
Luke Pulverenti 2016-09-12 14:10:09 -04:00
parent 8f88fb9a3b
commit 114a010bd4
17 changed files with 43 additions and 25 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

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.237",
"_release": "1.4.237",
"version": "1.4.239",
"_release": "1.4.239",
"_resolution": {
"type": "version",
"tag": "1.4.237",
"commit": "41b1a7ea6d039a5e431ceb1295f7e50ba2e54c2c"
"tag": "1.4.239",
"commit": "0ec984aee68fd5745adc13ba2bbbcf1bafcd995e"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

2
dashboard-ui/bower_components/emby-webcomponents/alert/alert.js vendored
View file

@ -15,7 +15,7 @@ define(['dialog', 'globalize'], function (dialog, globalize) {
var items = [];
items.push({
name: globalize.translate('sharedcomponents#ButtonOk'),
name: globalize.translate('sharedcomponents#ButtonGotIt'),
id: 'ok',
type: 'submit'
});

8
dashboard-ui/bower_components/emby-webcomponents/imageeditor/imageeditor.js vendored
View file

@ -299,6 +299,10 @@
hasChanges = true;
reload(page);
});
}, function () {
require(['alert'], function (alert) {
alert('This feature is coming soon to Emby Theater.');
});
});
}
@ -393,6 +397,10 @@
reload(page);
}
});
}, function () {
require(['alert'], function (alert) {
alert('This feature is coming soon to Emby Theater.');
});
});
});

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

@ -32,14 +32,14 @@
"iron-component-page": "polymerElements/iron-component-page#^1.1.6"
},
"private": true,
"homepage": "https://github.com/polymer/polymer",
"homepage": "https://github.com/Polymer/polymer",
"_release": "1.6.1",
"_resolution": {
"type": "version",
"tag": "v1.6.1",
"commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc"
},
"_source": "git://github.com/polymer/polymer.git",
"_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.1.0",
"_originalSource": "polymer/polymer"
"_originalSource": "Polymer/polymer"
}

2
dashboard-ui/cinemamodeconfiguration.html
View file

@ -90,7 +90,7 @@
</div>
</div>
<br />
<button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
<button is="emby-button" type="submit" class="raised button-submit block"><span>${ButtonSave}</span></button>
<p>${CinemaModeConfigurationHelp2}</p>
</form>
</div>

2
dashboard-ui/encodingsettings.html
View file

@ -94,7 +94,7 @@
</div>
<div>
<button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
<button is="emby-button" type="submit" class="raised button-submit block"><span>${ButtonSave}</span></button>
</div>
</form>
</div>

2
dashboard-ui/librarysettings.html
View file

@ -87,7 +87,7 @@
</div>
<br />
<button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
<button is="emby-button" type="submit" class="raised button-submit block"><span>${ButtonSave}</span></button>
</form>

2
dashboard-ui/metadatasubtitles.html
View file

@ -62,7 +62,7 @@
</div>
<div>
<button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
<button is="emby-button" type="submit" class="raised button-submit block"><span>${ButtonSave}</span></button>
</div>
</form>
</div>

8
dashboard-ui/notificationsetting.html
View file

@ -57,9 +57,13 @@
</div>
<div>
<br />
<button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
<button is="emby-button" type="submit" class="raised button-submit block">
<span>${ButtonSave}</span>
</button>
<button is="emby-button" type="button" class="raised button-cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
<button is="emby-button" type="button" class="raised button-cancel block btnCancel" onclick="history.back();">
<span>${ButtonCancel}</span>
</button>
</div>
</form>

2
dashboard-ui/playbackconfiguration.html
View file

@ -25,7 +25,7 @@
<br />
<div><button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button></div>
<div><button is="emby-button" type="submit" class="raised button-submit block"><span>${ButtonSave}</span></button></div>
</form>
</div>
</div>

2
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -1256,7 +1256,7 @@
errorMsg += '<br/>';
errorMsg += Globalize.translate('MessageEnsureOpenTuner');
}
else if (mediaSource && mediaSource.VideoType != "VideoFile") {
else if (mediaSource && mediaSource.VideoType && mediaSource.VideoType != "VideoFile") {
errorMsg += '<br/>';
errorMsg += '<br/>';
errorMsg += Globalize.translate('MessageFolderRipPlaybackExperimental');

2
dashboard-ui/scripts/sections.js
View file

@ -443,7 +443,7 @@
html += '</div>';
var scrollX = enableScrollX() && dom.getWindowSize().innerWidth >= 640;
var scrollX = enableScrollX() && dom.getWindowSize().innerWidth >= 600;
if (scrollX) {
html += '<div is="emby-itemscontainer" class="hiddenScrollX itemsContainer">';

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

@ -1,4 +1,4 @@
define(['jQuery'], function ($) {
define(['jQuery', 'fnchecked'], function ($) {
function loadMediaFolders(page, user, mediaFolders) {

2
dashboard-ui/streamingsettings.html
View file

@ -18,7 +18,7 @@
</select>
<div class="fieldDescription">${LabelChannelStreamQualityHelp}</div>
</div>
<button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
<button is="emby-button" type="submit" class="raised button-submit block"><span>${ButtonSave}</span></button>
</form>
</div>
</div>

6
dashboard-ui/userlibraryaccess.html
View file

@ -51,9 +51,9 @@
</div>
<br />
<div>
<button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
<button is="emby-button" type="button" class="raised button-cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
<button is="emby-button" type="submit" class="raised button-submit block">
<span>${ButtonSave}</span>
</button>
</div>
</form>
</div>

8
dashboard-ui/usernew.html
View file

@ -40,9 +40,13 @@
<br />
<div>
<button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
<button is="emby-button" type="submit" class="raised button-submit block">
<span>${ButtonSave}</span>
</button>
<button is="emby-button" type="button" class="raised button-cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
<button is="emby-button" type="button" class="raised button-cancel block btnCancel" onclick="history.back();">
<span>${ButtonCancel}</span>
</button>
</div>
</form>
</div>

4
dashboard-ui/userparentalcontrol.html
View file

@ -51,7 +51,9 @@
<br />
</div>
<div>
<button is="emby-button" type="submit" class="raised button-submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
<button is="emby-button" type="submit" class="raised button-submit block">
<span>${ButtonSave}</span>
</button>
</div>
</form>