Skip to content

Commit

Permalink
Minor bug fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
agordillo committed Jun 6, 2016
1 parent 9de0134 commit 3769a88
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion edit.html
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@
<div id="presentation_details_fields_row2">
<button id="metadata_clasification_button" type="button" class="button" i18n-key="i.advancedSettings">Advanced</button>
<button id="fill_details_later_button" type="button" class="button" i18n-key="i.Filllater">Fill later</button>
<button id="save_presentation_details" type="button" class="button" i18n-key="i.Continue" disabledtitle="Write a title and choose an avatar to continue">Continue</button>
<button id="save_presentation_details" type="button" class="button" i18n-key="i.Continue" i18n-key-disabledtooltip="i.tooltip.continueDisabled">Continue</button>
</div>
</div>

Expand Down
5 changes: 2 additions & 3 deletions js/VISH.Editor.Settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -401,11 +401,10 @@ VISH.Editor.Settings = (function(V,$,undefined){
if(enable){
$("#save_presentation_details").removeClass("buttonDisabledOnSettings");
$("#save_presentation_details").removeAttr("disabled");
$("#save_presentation_details").attr("disabledTitle",$("#save_presentation_details").attr("title"));
$("#save_presentation_details").removeAttr("title");
} else {
if(!$("#save_presentation_details").attr("title")){
$("#save_presentation_details").attr("title",$("#save_presentation_details").attr("disabledTitle"));
if(typeof $("#save_presentation_details").attr("title") == "undefined"){
$("#save_presentation_details").attr("title",V.I18n.getTrans("i.tooltip.continueDisabled"));
}
$("#save_presentation_details").addClass("buttonDisabledOnSettings");
$("#save_presentation_details").attr("disabled","true");
Expand Down
32 changes: 16 additions & 16 deletions js/doc/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -737,49 +737,49 @@
},
{
"file": "VISH.Editor.Settings.js",
"line": 429,
"line": 428,
"description": "function called when the user clicks on the save button\nin the initial presentation details fancybox to save\nthe data in order to be stored at the end in the JSON file",
"class": "VISH.Editor"
},
{
"file": "VISH.Editor.Settings.js",
"line": 668,
"line": 667,
"description": "function called when navigating into metadata options to manage tabs",
"class": "VISH.Editor"
},
{
"file": "VISH.Editor.Settings.js",
"line": 685,
"line": 684,
"description": "function called when the user clicks on the metadata options button",
"class": "VISH.Editor"
},
{
"file": "VISH.Editor.Settings.js",
"line": 698,
"line": 697,
"description": "Function called when the user clicks on the done button in the metadata options panel",
"class": "VISH.Editor"
},
{
"file": "VISH.Editor.Settings.js",
"line": 708,
"line": 707,
"description": "Function called when the user clicks on the catalog button",
"class": "VISH.Editor"
},
{
"file": "VISH.Editor.Settings.js",
"line": 717,
"line": 716,
"description": "Function called when the user clicks on the done button in the catalog panel",
"class": "VISH.Editor"
},
{
"file": "VISH.Editor.Settings.js",
"line": 732,
"line": 731,
"description": "Function to beautify upload behaviour",
"class": "VISH.Editor"
},
{
"file": "VISH.Editor.Settings.js",
"line": 748,
"line": 747,
"description": "Function to handle uploading an attachment behaviour",
"class": "VISH.Editor"
},
Expand Down Expand Up @@ -2038,35 +2038,35 @@
},
{
"message": "Missing item type\nfunction called when the user clicks on the save button\nin the initial presentation details fancybox to save\nthe data in order to be stored at the end in the JSON file",
"line": " VISH.Editor.Settings.js:429"
"line": " VISH.Editor.Settings.js:428"
},
{
"message": "Missing item type\nfunction called when navigating into metadata options to manage tabs",
"line": " VISH.Editor.Settings.js:668"
"line": " VISH.Editor.Settings.js:667"
},
{
"message": "Missing item type\nfunction called when the user clicks on the metadata options button",
"line": " VISH.Editor.Settings.js:685"
"line": " VISH.Editor.Settings.js:684"
},
{
"message": "Missing item type\nFunction called when the user clicks on the done button in the metadata options panel",
"line": " VISH.Editor.Settings.js:698"
"line": " VISH.Editor.Settings.js:697"
},
{
"message": "Missing item type\nFunction called when the user clicks on the catalog button",
"line": " VISH.Editor.Settings.js:708"
"line": " VISH.Editor.Settings.js:707"
},
{
"message": "Missing item type\nFunction called when the user clicks on the done button in the catalog panel",
"line": " VISH.Editor.Settings.js:717"
"line": " VISH.Editor.Settings.js:716"
},
{
"message": "Missing item type\nFunction to beautify upload behaviour",
"line": " VISH.Editor.Settings.js:732"
"line": " VISH.Editor.Settings.js:731"
},
{
"message": "Missing item type\nFunction to handle uploading an attachment behaviour",
"line": " VISH.Editor.Settings.js:748"
"line": " VISH.Editor.Settings.js:747"
},
{
"message": "Missing item type\nfunction to know if the slides have the focus or not\nUse to disable actions (like keyboard shortcuts) when the slide is not focused",
Expand Down
5 changes: 2 additions & 3 deletions js/doc/files/VISH.Editor.Settings.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -483,11 +483,10 @@ <h1 class="file-heading">File: VISH.Editor.Settings.js</h1>
if(enable){
$(&quot;#save_presentation_details&quot;).removeClass(&quot;buttonDisabledOnSettings&quot;);
$(&quot;#save_presentation_details&quot;).removeAttr(&quot;disabled&quot;);
$(&quot;#save_presentation_details&quot;).attr(&quot;disabledTitle&quot;,$(&quot;#save_presentation_details&quot;).attr(&quot;title&quot;));
$(&quot;#save_presentation_details&quot;).removeAttr(&quot;title&quot;);
} else {
if(!$(&quot;#save_presentation_details&quot;).attr(&quot;title&quot;)){
$(&quot;#save_presentation_details&quot;).attr(&quot;title&quot;,$(&quot;#save_presentation_details&quot;).attr(&quot;disabledTitle&quot;));
if(typeof $(&quot;#save_presentation_details&quot;).attr(&quot;title&quot;) == &quot;undefined&quot;){
$(&quot;#save_presentation_details&quot;).attr(&quot;title&quot;,V.I18n.getTrans(&quot;i.tooltip.continueDisabled&quot;));
}
$(&quot;#save_presentation_details&quot;).addClass(&quot;buttonDisabledOnSettings&quot;);
$(&quot;#save_presentation_details&quot;).attr(&quot;disabled&quot;,&quot;true&quot;);
Expand Down
8 changes: 5 additions & 3 deletions js/lang/translations.js
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,8 @@ VISH.Locales = {
"i.Zoom" : "Zoom",
"i.Zoom-" : "Zoom-",
"i.Zoom+" : "Zoom+",
"i.tooltip.QSInput" : "Enter a name for the live quiz",
"i.tooltip.continueDisabled" : "Write a title and choose an avatar to continue",
"i.tooltip.QSInput" : "Enter a name for the live quiz",
"i.tooltip.UploadAttachment" : "If this button is disabled, you need to save your excursion first",
"i.vtTitle_GStarted" : "Getting Started with ViSH Editor",
"i.last" : "last"
Expand Down Expand Up @@ -992,8 +993,9 @@ VISH.Locales = {
"i.Zoom-" : "Ampliar-",
"i.Zoom+" : "Ampliar+",
//Tooltips
"i.tooltip.QSInput" : "Introduce un nombre para el cuestionario en vivo",
"i.tooltip.Help" : "Ayuda",
"i.tooltip.continueDisabled" : "Escribe un título y escoge un avatar para continuar",
"i.tooltip.QSInput" : "Introduce un nombre para el cuestionario en vivo",
"i.tooltip.Help" : "Ayuda",
"i.tooltip.UploadAttachment" : "Si no puedes subir un archivo adjunto, guarda primero la excursión",
//Video Tutorials
"i.vtTitle_GStarted" : "Introducción a ViSH Editor",
Expand Down

0 comments on commit 3769a88

Please sign in to comment.