Skip to content
This repository has been archived by the owner on May 26, 2020. It is now read-only.

Use of JS Promise för aply and save in image edit view + some modal messages + a modal progress #561

Open
wants to merge 12 commits into
base: dev
Choose a base branch
from
Open

Use of JS Promise för aply and save in image edit view + some modal messages + a modal progress #561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7bf3a7c
Merge pull request #9 from joomla-projects/dev
schnuti Jun 4, 2018
95a321d
Use of JS Promise för aply and save in image edit view + some modal m…
schnuti Jun 4, 2018
adeb370
Too much clean up
schnuti Jun 4, 2018
34154d3
Removed an id and added back some used variables
schnuti Jun 4, 2018
1670b2d
Changed let to var
schnuti Jun 5, 2018
6013604
2 let slipped through
schnuti Jun 5, 2018
70a53ac
And const replaced with var
schnuti Jun 5, 2018
09bab1d
Removed inline CSS style for progress bar
schnuti Jun 5, 2018
1be4ebb
Added default_texts for the missing JS texts
schnuti Jun 5, 2018
c6705e2
Load the needed JS texts
schnuti Jun 5, 2018
0b2e0a2
Added filename to Progress
schnuti Jun 7, 2018
c9e7fe8
js minified
schnuti Jun 7, 2018
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
3 changes: 3 additions & 0 deletions administrator/components/com_media/tmpl/file/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
// Add stylesheets
JHtml::_('stylesheet', 'media/com_media/css/mediamanager.css');

// Populate the language
$this->loadTemplate('texts');

/**
* @var JForm $form
*/
Expand Down
13 changes: 13 additions & 0 deletions administrator/components/com_media/tmpl/file/default_texts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php
/**
* @package Joomla.Administrator
* @subpackage com_media
*
* @copyright Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/
defined('_JEXEC') or die;

JText::script('COM_MEDIA_ERROR', true);
JText::script('COM_MEDIA_SERVER_ERROR', true);
JText::script('COM_MEDIA_UPDLOAD_SUCCESS', true);
Loading