Skip to content

Updated with language selection #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SmokyBob merged 4 commits into from
Dec 29, 2014
Merged

Updated with language selection #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92b1196
reference to prettycode branch with language attribute implemented
SmokyBob Dec 29, 2014
72c5529
show language selection and use it for the prettifyelement
SmokyBob Dec 29, 2014
7e84700
changed version for publishing
SmokyBob Dec 29, 2014
0accd7d
fix language values
SmokyBob Dec 29, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dependencies": {
"polymer": "Polymer/polymer#^0.5.2",
"core-elements": "Polymer/core-elements#^0.5.2",
"prettify-element": "Polymer/prettify-element3^0.5.2",
"prettify-element": "SmokyBob/prettify-element#master",
"paper-button": "Polymer/paper-button#~0.5.2",
"paper-dropdown-menu": "Polymer/paper-dropdown-menu#~0.5.2",
"paper-dropdown": "Polymer/paper-dropdown#~0.5.2",
Expand Down
8 changes: 4 additions & 4 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
</div>
<div layout horizontal flex>
<!--Language selection hidden as now the lang class id difficult to set on the prettify-element-->
<paper-dropdown-menu id="pdmLanguage" label="Select Language" style="display:none"
<paper-dropdown-menu id="pdmLanguage" label="Select Language"
on-core-select="{{languageSelected}}">
<paper-dropdown id="lang" class="dropdown">
<core-menu class="menu" >
<paper-item data-value="--">(auto detect language)</paper-item>
<paper-item data-value="c++">c++</paper-item>
<paper-item data-value="cpp">c++</paper-item>
<paper-item data-value="java">java</paper-item>
<paper-item data-value="javascript">javascript</paper-item>
<paper-item data-value="js">javascript</paper-item>
<paper-item data-value="xml">xml</paper-item>
<paper-item data-value="html">html</paper-item>
<paper-item data-value="css">css</paper-item>
Expand All @@ -49,7 +49,7 @@
</paper-autogrow-textarea>
<div id="slidesWarnings">
</div>
<prettify-element id="destination" text="{{code}}" on-tap="{{selPrettyCode}}"></prettify-element>
<prettify-element id="destination" text="{{code}}" language="{{language}}" on-tap="{{selPrettyCode}}"></prettify-element>
</template>

<script src="main.js"></script>
Expand Down
10 changes: 5 additions & 5 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
var mainContent = document.querySelector('#mainContent');

//Get data from the syncStorage
chrome.storage.sync.get(["lang","theCode","theme","fontPt"],function(localStorage){
mainContent.lang = localStorage.lang || '--';
chrome.storage.sync.get(["language","theCode","theme","fontPt"],function(localStorage){
mainContent.language = localStorage.language || '--';
mainContent.code = localStorage.theCode || '';
mainContent.theme = localStorage.theme || 'light';
mainContent.fontPt = localStorage.fontPt || 14;
Expand Down Expand Up @@ -32,7 +32,7 @@ mainContent.addEventListener('template-bound', function(){
//Find the label of the selected language to set it on the paper-dropdown-menu
var mnItems =document.querySelectorAll('paper-item');
[].some.call(mnItems, function(mnItem){
if (mnItem.dataset.value==mainContent.lang){
if (mnItem.dataset.value==mainContent.language){
//Item found, update the selectedItem to change the label
mainContent.$.pdmLanguage.selectedItemLabel=mnItem.innerText;
return true;
Expand Down Expand Up @@ -67,8 +67,8 @@ var setThemeAndLang = function(){
mainContent.languageSelected = function(selMenu){
//Changed selected language, update the value and store
if(selMenu.detail.isSelected){
mainContent.lang=selMenu.detail.item.dataset.value;
chrome.storage.sync.set({'lang': mainContent.lang}, function() {
mainContent.language=selMenu.detail.item.dataset.value;
chrome.storage.sync.set({'language': mainContent.language}, function() {
//Nothing to do
});

Expand Down
2 changes: 1 addition & 1 deletion manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"short_name": "PrettyCode",
"description": "Code prettyfier following guidelines for GDE Videos",

"version": "0.0.1.0",
"version": "0.0.2.0",

"icons": {
"32": "assets/favicon_32.png",
Expand Down